TeX 1995 July

home *** CD-ROM | disk | FTP | other *** search

/ TeX 1995 July / TeX CD-ROM July 1995 (Disc 1)(Walnut Creek)(1995).ISO / tex-k / web2c.kpathsea-2.2.help < prev next >

Wrap

Internet Message Format | 1994-10-25 | 109KB

From interran@uluru.Stanford.EDU Sat Oct 15 20:45:32 1994 Date: Sat, 15 Oct 94 17:45:22 PDT From: interran@uluru.Stanford.EDU (John Interrante) To: kb@cs.umb.edu Subject: web2c.kpathsea-2.2.help Hello Karl, Here's the updated patch for upgrading web2c-6.1 to work with kpathsea 2.2. I only had to delete the kpathsea 2.1 bug fixes which are now part of kpathsea 2.2 and update the web2c/configure.in and web2c/configure patches to reflect your changes to AC_FIND_XTRA. You could even diff this file against web2c.kpathsea-2.1.help if you wanted and be able to read the output. John ftp.cs.umb.edu:pub/tex/web2c.kpathsea-2.2.help, 15oct94. This patch will allow you to take advantage of kpathsea-2.2's improvements over kpathsea-1.8 (faster path searching, runtime configuration files, etc.---see kpathsea/NEWS). It will work only with the version of kpathsea supplied with dviljk-2.2, dvipsk-5.58b, or xdvik-18c. It will not work with previous or future versions of kpathsea, at least not without modification. Use it at your own risk; this patch has undergone little testing so it may introduce some new bugs into your TeX or MF. You should apply it only if you are prepared to debug and fix any unexpected problems which might occur. Please direct questions about this patch to the tex-k@cs.umb.edu mailing list (in other words, not to kb@cs.umb.edu). Thanks. Here are the instructions for upgrading web2c-6.1 to work with kpathsea-2.2. 1. Fetch one of the following tar files, `dviljk-2.2.tar.gz', `dvipsk-5.58b.tar.gz', or `xdvik-18c.tar.gz', from your nearest CTAN archive. It does not matter which tar file you fetch since they all have the same version of kpathsea. If you don't plan to keep around the dviljk, dvipsk, or xdvik subdirectory, you might as well get the smallest tar file: `xdvik-18c.tar.gz'. 2. Fetch the tar files `web-6.1.tar.gz' and `web2c-6.1.tar.gz' from your nearest CTAN archive. 3. Unpack all of the tar files in the same directory. You will have two new directories: web2c-6.1 and one of dviljk-2.2, dvipsk-5.58b, or xdvik-18c depending on which tar file you chose in step 1. 4. Move the subdirectory web2c-6.1/web2c into dviljk-2.2, dvipsk-5.58b, or xdvik-18c: mv web2c-6.1/web2c xdvik-18c 5. Rename the directory now containing the web2c subdirectory to web2c-6.1a or whatever name you choose: mv xdvik-18c web2c-6.1a 6. You don't need the remaining files in web2c-6.1 or the subdirectories dviljk, dvipsk, or xdvik to build the subdirectory web2c, so you can delete them if you wish: rm -rf web2c-6.1 rm -rf web2c-6.1a/xdvik 7. Patch a few files in the web2c subdirectory. The patch is appended below. First move into the directory containing the web2c subdirectory and then run patch: cd web2c-6.1a patch -p -s < web2c.kpathsea-2.2.help This patch was made so that it won't matter what you call the directory containing the web2c subdirectory since you'll be inside it before applying the patch. You shouldn't get any output from patch unless an error occurs. 8. Now follow the normal procedure for installation of web2c-6.1. You will have to edit the fmts variable in web2c/Makefile.in if you want to build an additional format besides tex.fmt. You will need to have all of the latex input files installed somewhere in your /usr/local/lib/texmf if you want to make the latex format. I prefer to build and install both the latex input files and format separately (ftp to your nearest CTAN archive, cd to the directory /tex-archive/macros/latex, get base.tar.gz and package.tar.gz, and follow the directions therein for building and installing latex). *** web2c/Makefile.in.save Thu Feb 3 04:47:59 1994 --- web2c/Makefile.in Fri Sep 23 23:45:44 1994 *************** *** 76,79 **** --- 76,80 ---- bases = mf.base cmmf.base fmts = tex.fmt latex.fmt + fmts = tex.fmt # slitex.fmt etex.fmt amslatex.fmt amstex.fmt texinfo.fmt inrstex.fmt # picplus.fmt *************** *** 125,131 **** # wlibs is substituted by web2c's configure, LIBS by general configure # routines, and the others by AC_FIND_XTRA. ! x_include_flags = @x_include_flags@ ! x_lib_flags = @x_lib_flags@ ! x_extra_libs = @x_extra_libs@ wlibs = @wlibs@ LIBS = @LIBS@ $(extralibs) --- 126,132 ---- # wlibs is substituted by web2c's configure, LIBS by general configure # routines, and the others by AC_FIND_XTRA. ! x_include_flags = @X_CFLAGS@ ! x_lib_flags = @X_LIBS@ ! x_extra_libs = @X_EXTRA_LIBS@ wlibs = @wlibs@ LIBS = @LIBS@ $(extralibs) *** web2c/configure.in.save Tue Feb 1 14:42:20 1994 --- web2c/configure.in Sat Oct 15 15:32:23 1994 *************** *** 33,37 **** dnl Must do this last, as the addition to DEFS in Autoconf 1.3 confuses dnl the compiler. ! AC_DECLARE_YYTEXT echo checking for window system libraries --- 33,37 ---- dnl Must do this last, as the addition to DEFS in Autoconf 1.3 confuses dnl the compiler. ! AC_YYTEXT_POINTER echo checking for window system libraries *************** *** 47,54 **** AC_FIND_X AC_FIND_XTRA ! if test -z "$Xextlib"; then ! AC_HAVE_LIBRARY(Xext, Xextlib=-lXext) ! fi ! wlibs="-lXt $Xextlib -lX11 $wlibs" (cd $srcdir/mf/MFwindow; rm -f x11.c; $LN_S x11-Xt.c x11.c) fi --- 47,51 ---- AC_FIND_X AC_FIND_XTRA ! wlibs="-lXt $X_R6_LIBS -lX11 $wlibs" (cd $srcdir/mf/MFwindow; rm -f x11.c; $LN_S x11-Xt.c x11.c) fi *** web2c/configure.save Tue Feb 1 14:42:36 1994 --- web2c/configure Mon Oct 24 12:02:32 1994 *************** *** 1,16 **** #!/bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated automatically using autoconf. ! # Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc. ! # This program is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2, or (at your option) # any later version. ! # This program is distributed in the hope that it will be useful, ! # but WITHOUT ANY WARRANTY; without even the implied warranty of ! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! # GNU General Public License for more details. # You should have received a copy of the GNU General Public License --- 1,16 ---- #!/bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated automatically using autoconf version 1.11 ! # Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc. ! # This configure script is free software; you can redistribute it and/or ! # modify it under the terms of the GNU General Public License as published ! # by the Free Software Foundation; either version 2, or (at your option) # any later version. ! # This script is distributed in the hope that it will be useful, but ! # WITHOUT ANY WARRANTY; without even the implied warranty of ! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General ! # Public License for more details. # You should have received a copy of the GNU General Public License *************** *** 18,132 **** # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ! # Usage: configure [--srcdir=DIR] [--host=HOST] [--gas] [--nfp] ! # [--prefix=PREFIX] [--exec-prefix=PREFIX] [--with-PACKAGE[=VALUE]] ! # Ignores all args except --srcdir, --prefix, --exec-prefix, and ! # --with-PACKAGE[=VALUE] unless this script has special code to handle it. ! for arg do - # Handle --exec-prefix with a space before the argument. - if test x$next_exec_prefix = xyes; then exec_prefix=$arg; next_exec_prefix= - # Handle --host with a space before the argument. - elif test x$next_host = xyes; then next_host= - # Handle --prefix with a space before the argument. - elif test x$next_prefix = xyes; then prefix=$arg; next_prefix= - # Handle --srcdir with a space before the argument. - elif test x$next_srcdir = xyes; then srcdir=$arg; next_srcdir= - else - case $arg in - # For backward compatibility, recognize -exec-prefix and --exec_prefix. - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* | --exec=* | --exe=* | --ex=* | --e=*) - exec_prefix=`echo $arg | sed 's/[-a-z_]*=//'` ;; - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- | --exec | --exe | --ex | --e) - next_exec_prefix=yes ;; - - -gas | --gas | --ga | --g) ;; - - -host=* | --host=* | --hos=* | --ho=* | --h=*) ;; - -host | --host | --hos | --ho | --h) - next_host=yes ;; - - -nfp | --nfp | --nf) ;; - - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix=`echo $arg | sed 's/[-a-z_]*=//'` ;; - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - next_prefix=yes ;; - - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=* | --s=*) - srcdir=`echo $arg | sed 's/[-a-z_]*=//'` ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr | --s) - next_srcdir=yes ;; - - -with-* | --with-*) - package=`echo $arg|sed -e 's/-*with-//' -e 's/=.*//'` - # Reject names that aren't valid shell variable names. - if test -n "`echo $package| sed 's/[-a-zA-Z0-9_]//g'`"; then - echo "configure: $package: invalid package name" >&2; exit 1 - fi - package=`echo $package| sed 's/-/_/g'` - case "$arg" in - *=*) val="`echo $arg|sed 's/[^=]*=//'`" ;; - *) val=1 ;; - esac - eval "with_$package='$val'" ;; ! -v | -verbose | --verbose | --verbos | --verbo | --verb | --ver | --ve | --v) ! verbose=yes ;; ! *) ;; esac ! fi done ! trap 'rm -fr conftest* confdefs* core; exit 1' 1 3 15 ! trap 'rm -f confdefs*' 0 # NLS nuisances. # These must not be set unconditionally because not all systems understand # e.g. LANG=C (notably SCO). ! if test "${LC_ALL+set}" = 'set' ; then LC_ALL=C; export LC_ALL; fi ! if test "${LANG+set}" = 'set' ; then LANG=C; export LANG; fi ! rm -f conftest* confdefs.h # AIX cpp loses on an empty file, so make sure it contains at least a newline. echo > confdefs.h - compile='${CC-cc} $CFLAGS conftest.c -o conftest $LIBS >/dev/null 2>&1' # A filename unique to this package, relative to the directory that # configure is in, which we can look for to find out if srcdir is correct. ! unique_file=web2c/web2c.c # Find the source files, if location was not specified. if test -z "$srcdir"; then ! srcdirdefaulted=yes # Try the directory containing this script, then `..'. ! prog=$0 ! confdir=`echo $prog|sed 's%/[^/][^/]*$%%'` ! test "X$confdir" = "X$prog" && confdir=. ! srcdir=$confdir ! if test ! -r $srcdir/$unique_file; then srcdir=.. fi fi ! if test ! -r $srcdir/$unique_file; then ! if test x$srcdirdefaulted = xyes; then ! echo "configure: Can not find sources in \`${confdir}' or \`..'." 1>&2 else ! echo "configure: Can not find sources in \`${srcdir}'." 1>&2 fi - exit 1 fi ! # Preserve a srcdir of `.' to avoid automounter screwups with pwd. ! # But we can't avoid them for `..', to make subdirectories work. ! case $srcdir in ! .|/*|~*) ;; ! *) srcdir=`cd $srcdir; pwd` ;; # Make relative path absolute. ! esac - # Save the original args to write them into config.status later. - configure_args="$*" - --- 18,319 ---- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ! # Save the original args to write them into config.status later. ! configure_args="$*" ! # Only options that might do something get documented. ! ac_usage="Usage: configure [options] [host] ! Options: [defaults in brackets after descriptions] ! --build=BUILD configure for building on BUILD [BUILD=HOST] ! --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) ! --enable-FEATURE[=ARG] include FEATURE [ARG=yes] ! --exec-prefix=PREFIX install host dependent files in PREFIX [/usr/local] ! --help print this message ! --host=HOST configure for HOST [guessed] ! --prefix=PREFIX install host independent files in PREFIX [/usr/local] ! --quiet, --silent do not print \`checking for...' messages ! --srcdir=DIR find the sources in DIR [configure dir or ..] ! --target=TARGET configure for TARGET [TARGET=HOST] ! --verbose print results of checks ! --version print the version of autoconf that created configure ! --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] ! --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) ! --x-includes=DIR X include files are in DIR ! --x-libraries=DIR X library files are in DIR" ! ! # Initialize some variables set by options. ! # The variables have the same names as the options, with ! # dashes changed to underlines. ! build=NONE ! exec_prefix= ! host=NONE ! no_create= ! nonopt=NONE ! norecursion= ! prefix= ! program_prefix= ! program_suffix= ! program_transform_name= ! silent= ! srcdir= ! target=NONE ! verbose= ! x_includes= ! x_libraries= ! ! ac_prev= ! for ac_option do ! # If the previous option needs an argument, assign it. ! if test -n "$ac_prev"; then ! eval "$ac_prev=\$ac_option" ! ac_prev= ! continue ! fi ! ! # Accept (but ignore some of) the important Cygnus configure ! # options, so we can diagnose typos. ! case "$ac_option" in ! -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; ! *) ac_optarg= ;; ! esac ! ! case "$ac_option" in ! ! -build | --build | --buil | --bui | --bu | --b) ! ac_prev=build ;; ! -build=* | --build=* | --buil=* | --bui=* | --bu=* | --b=*) ! build="$ac_optarg" ;; ! ! -disable-* | --disable-*) ! ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` ! # Reject names that aren't valid shell variable names. ! if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then ! echo "configure: $ac_feature: invalid feature name" >&2; exit 1 ! fi ! ac_feature=`echo $ac_feature| sed 's/-/_/g'` ! eval "enable_${ac_feature}=no" ;; ! ! -enable-* | --enable-*) ! ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` ! # Reject names that aren't valid shell variable names. ! if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then ! echo "configure: $ac_feature: invalid feature name" >&2; exit 1 ! fi ! ac_feature=`echo $ac_feature| sed 's/-/_/g'` ! case "$ac_option" in ! *=*) ;; ! *) ac_optarg=yes ;; esac ! eval "enable_${ac_feature}='$ac_optarg'" ;; ! ! # For backward compatibility, recognize -exec-prefix and --exec_prefix. ! -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ ! | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ ! | --exec | --exe | --ex) ! ac_prev=exec_prefix ;; ! -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ ! | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ ! | --exec=* | --exe=* | --ex=*) ! exec_prefix="$ac_optarg" ;; ! ! -gas | --gas | --ga | --g) ! with_gas=yes ;; # Obsolete; use --with-gas. ! ! -help | --help | --hel | --he) ! cat << EOF ! $ac_usage ! EOF ! exit 0 ;; ! ! -host | --host | --hos | --ho) ! ac_prev=host ;; ! -host=* | --host=* | --hos=* | --ho=*) ! host="$ac_optarg" ;; ! ! -nfp | --nfp | --nf) ! with_fp=no ;; # Obsolete; use --without-fp. ! ! -no-create | --no-create | --no-creat | --no-crea | --no-cre \ ! | --no-cr | --no-c) ! no_create=yes ;; ! ! -norecursion | --norecursion | --norecursio | --norecursi \ ! | --norecurs | --norecur | --norecu | --norec | --nore | --nor) ! norecursion=yes ;; ! ! -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) ! ac_prev=prefix ;; ! -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) ! prefix="$ac_optarg" ;; ! ! -program-prefix | --program-prefix | --program-prefi | --program-pref \ ! | --program-pre | --program-pr | --program-p) ! ac_prev=program_prefix ;; ! -program-prefix=* | --program-prefix=* | --program-prefi=* \ ! | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) ! program_prefix="$ac_optarg" ;; ! ! -program-suffix | --program-suffix | --program-suffi | --program-suff \ ! | --program-suf | --program-su | --program-s) ! ac_prev=program_suffix ;; ! -program-suffix=* | --program-suffix=* | --program-suffi=* \ ! | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) ! program_suffix="$ac_optarg" ;; ! ! -program-transform-name | --program-transform-name \ ! | --program-transform-nam | --program-transform-na \ ! | --program-transform-n | --program-transform- \ ! | --program-transform | --program-transfor \ ! | --program-transfo | --program-transf \ ! | --program-trans | --program-tran \ ! | --progr-tra | --program-tr | --program-t) ! ac_prev=program_transform_name ;; ! -program-transform-name=* | --program-transform-name=* \ ! | --program-transform-nam=* | --program-transform-na=* \ ! | --program-transform-n=* | --program-transform-=* \ ! | --program-transform=* | --program-transfor=* \ ! | --program-transfo=* | --program-transf=* \ ! | --program-trans=* | --program-tran=* \ ! | --progr-tra=* | --program-tr=* | --program-t=*) ! program_transform_name="$ac_optarg" ;; ! ! -q | -quiet | --quiet | --quie | --qui | --qu | --q \ ! | -silent | --silent | --silen | --sile | --sil) ! silent=yes ;; ! ! -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ! ac_prev=srcdir ;; ! -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) ! srcdir="$ac_optarg" ;; ! ! -target | --target | --targe | --targ | --tar | --ta | --t) ! ac_prev=target ;; ! -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) ! target="$ac_optarg" ;; ! ! -v | -verbose | --verbose | --verbos | --verbo | --verb) ! verbose=yes ;; ! ! -version | --version | --versio | --versi | --vers) ! echo "configure generated by autoconf version 1.11" ! exit 0 ;; ! ! -with-* | --with-*) ! ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` ! # Reject names that aren't valid shell variable names. ! if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then ! echo "configure: $ac_package: invalid package name" >&2; exit 1 ! fi ! ac_package=`echo $ac_package| sed 's/-/_/g'` ! case "$ac_option" in ! *=*) ;; ! *) ac_optarg=yes ;; ! esac ! eval "with_${ac_package}='$ac_optarg'" ;; ! ! -without-* | --without-*) ! ac_package=`echo $ac_option|sed -e 's/-*without-//'` ! # Reject names that aren't valid shell variable names. ! if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then ! echo "configure: $ac_package: invalid package name" >&2; exit 1 ! fi ! ac_package=`echo $ac_package| sed 's/-/_/g'` ! eval "with_${ac_package}=no" ;; ! ! --x) with_x=yes ;; # Obsolete; use --with-x. ! ! -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ ! | --x-incl | --x-inc | --x-in | --x-i) ! ac_prev=x_includes ;; ! -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ ! | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) ! x_includes="$ac_optarg" ;; ! ! -x-libraries | --x-libraries | --x-librarie | --x-librari \ ! | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) ! ac_prev=x_libraries ;; ! -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ ! | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) ! x_libraries="$ac_optarg" ;; ! ! -*) echo "configure: $ac_option: invalid option; use --help to show usage" >&2; exit 1 ! ;; ! ! *) ! if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then ! echo "configure: warning: $ac_option: invalid host type" >&2 ! fi ! if test "x$nonopt" != xNONE; then ! echo "configure: can only configure for one host and one target at a time" >&2; exit 1 ! fi ! nonopt="$ac_option" ! ;; ! ! esac done ! if test -n "$ac_prev"; then ! echo "configure: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" >&2; exit 1 ! fi ! ! trap 'rm -fr conftest* confdefs* core $ac_clean_files; exit 1' 1 2 15 ! trap 'rm -fr confdefs* $ac_clean_files' 0 ! ! # Save the original args if we used an alternate arg parser. ! ac_configure_temp="${configure_args-$*}" ! # Strip out --no-create and --norecursion so they don't pile up. ! configure_args= ! for ac_arg in $ac_configure_temp; do ! case "$ac_arg" in ! -no-create | --no-create | --no-creat | --no-crea | --no-cre \ ! | --no-cr | --no-c) ;; ! -norecursion | --norecursion | --norecursio | --norecursi \ ! | --norecurs | --norecur | --norecu | --norec | --nore | --nor) ;; ! *) configure_args="$configure_args $ac_arg" ;; ! esac ! done # NLS nuisances. # These must not be set unconditionally because not all systems understand # e.g. LANG=C (notably SCO). ! if test "${LC_ALL+set}" = 'set'; then LC_ALL=C; export LC_ALL; fi ! if test "${LANG+set}" = 'set'; then LANG=C; export LANG; fi ! # confdefs.h avoids OS command line length limits that DEFS can exceed. ! rm -rf conftest* confdefs.h # AIX cpp loses on an empty file, so make sure it contains at least a newline. echo > confdefs.h # A filename unique to this package, relative to the directory that # configure is in, which we can look for to find out if srcdir is correct. ! ac_unique_file=web2c/web2c.c # Find the source files, if location was not specified. if test -z "$srcdir"; then ! ac_srcdir_defaulted=yes # Try the directory containing this script, then `..'. ! ac_prog=$0 ! ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` ! test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. ! srcdir=$ac_confdir ! if test ! -r $srcdir/$ac_unique_file; then srcdir=.. fi fi ! if test ! -r $srcdir/$ac_unique_file; then ! if test x$ac_srcdir_defaulted = xyes; then ! echo "configure: can not find sources in ${ac_confdir} or .." >&2; exit 1 else ! echo "configure: can not find sources in ${srcdir}" >&2; exit 1 fi fi ! ac_ext=c ! # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ! ac_cpp='${CPP}' ! ac_compile='${CC-cc} $CFLAGS $LDFLAGS conftest.${ac_ext} -o conftest $LIBS >/dev/null 2>&1' *************** *** 138,152 **** if test -z "$CC"; then # Extract the first word of `gcc', so it can be a program name with args. ! set dummy gcc; word=$2 ! echo checking for $word ! IFS="${IFS= }"; saveifs="$IFS"; IFS="${IFS}:" ! for dir in $PATH; do ! test -z "$dir" && dir=. ! if test -f $dir/$word; then CC="gcc" break fi done ! IFS="$saveifs" fi test -z "$CC" && CC="cc" --- 325,339 ---- if test -z "$CC"; then # Extract the first word of `gcc', so it can be a program name with args. ! set ac_dummy gcc; ac_word=$2 ! test -n "$silent" || echo "checking for $ac_word" ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do ! test -z "$ac_dir" && ac_dir=. ! if test -f $ac_dir/$ac_word; then CC="gcc" break fi done ! IFS="$ac_save_ifs" fi test -z "$CC" && CC="cc" *************** *** 165,169 **** rm -f conftest* ! echo checking how to run the C preprocessor if test -z "$CPP"; then # This must be in double quotes, not single quotes, because CPP may get --- 352,356 ---- rm -f conftest* ! test -n "$silent" || echo "checking how to run the C preprocessor" if test -z "$CPP"; then # This must be in double quotes, not single quotes, because CPP may get *************** *** 171,181 **** # make. It must be expanded now. CPP="${CC-cc} -E" ! cat > conftest.c <<EOF #include "confdefs.h" #include <stdio.h> Syntax Error EOF ! err=`eval "($CPP conftest.c >/dev/null) 2>&1"` ! if test -z "$err"; then : else --- 358,383 ---- # make. It must be expanded now. CPP="${CC-cc} -E" ! cat > conftest.${ac_ext} <<EOF #include "confdefs.h" #include <stdio.h> Syntax Error EOF ! # Some shells (Coherent) do redirections in the wrong order, so need ! # the parens. ! ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"` ! if test -z "$ac_err"; then ! : ! else ! rm -rf conftest* ! CPP="${CC-cc} -E -traditional-cpp" ! cat > conftest.${ac_ext} <<EOF ! #include "confdefs.h" ! #include <stdio.h> ! Syntax Error ! EOF ! # Some shells (Coherent) do redirections in the wrong order, so need ! # the parens. ! ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"` ! if test -z "$ac_err"; then : else *************** *** 185,189 **** rm -f conftest* fi ! test ".${verbose}" != "." && echo " setting CPP to $CPP" # Make sure to not get the incompatible SysV /etc/install and --- 387,393 ---- rm -f conftest* fi ! rm -f conftest* ! fi ! test -n "$verbose" && echo " setting CPP to $CPP" # Make sure to not get the incompatible SysV /etc/install and *************** *** 192,246 **** # or the AFS install, which mishandles nonexistent args, or # /usr/ucb/install on SVR4, which tries to use the nonexistent group ! # `staff'. On most BSDish systems install is in /usr/bin, not /usr/ucb ! # anyway. Sigh. ! if test "z${INSTALL}" = "z" ; then ! echo checking for install ! IFS="${IFS= }"; saveifs="$IFS"; IFS="${IFS}:" ! for dir in $PATH; do ! test -z "$dir" && dir=. ! case $dir in ! /etc|/usr/sbin|/usr/etc|/usr/afsws/bin|/usr/ucb) ;; *) ! if test -f $dir/installbsd; then ! INSTALL="$dir/installbsd -c" # OSF1 ! INSTALL_PROGRAM='$(INSTALL)' ! INSTALL_DATA='$(INSTALL) -m 644' ! break ! fi ! if test -f $dir/install; then ! if grep dspmsg $dir/install >/dev/null 2>&1; then ! : # AIX ! else ! INSTALL="$dir/install -c" ! INSTALL_PROGRAM='$(INSTALL)' ! INSTALL_DATA='$(INSTALL) -m 644' ! break fi ! fi ;; esac done ! IFS="$saveifs" fi - INSTALL=${INSTALL-cp} test -n "$verbose" && echo " setting INSTALL to $INSTALL" ! INSTALL_PROGRAM=${INSTALL_PROGRAM-'$(INSTALL)'} test -n "$verbose" && echo " setting INSTALL_PROGRAM to $INSTALL_PROGRAM" ! INSTALL_DATA=${INSTALL_DATA-'$(INSTALL)'} test -n "$verbose" && echo " setting INSTALL_DATA to $INSTALL_DATA" if test -z "$RANLIB"; then # Extract the first word of `ranlib', so it can be a program name with args. ! set dummy ranlib; word=$2 ! echo checking for $word ! IFS="${IFS= }"; saveifs="$IFS"; IFS="${IFS}:" ! for dir in $PATH; do ! test -z "$dir" && dir=. ! if test -f $dir/$word; then RANLIB="ranlib" break fi done ! IFS="$saveifs" fi test -z "$RANLIB" && RANLIB=":" --- 396,471 ---- # or the AFS install, which mishandles nonexistent args, or # /usr/ucb/install on SVR4, which tries to use the nonexistent group ! # `staff', or /sbin/install on IRIX which has incompatible command-line ! # syntax. Sigh. ! # ! # On most BSDish systems install is in /usr/bin, not /usr/ucb ! # anyway. ! # This turns out not to be true, so the mere pathname isn't an indication ! # of whether the program works. What we really need is a set of tests for ! # the install program to see if it actually works in all the required ways. ! # ! # Avoid using ./install, which might have been erroneously created ! # by make from ./install.sh. ! if test -z "${INSTALL}"; then ! test -n "$silent" || echo "checking for a BSD compatible install" ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do ! case "$ac_dir" in ! ''|.|/etc|/sbin|/usr/sbin|/usr/etc|/usr/afsws/bin|/usr/ucb) ;; *) ! # OSF1 and SCO ODT 3.0 have their own names for install. ! for ac_prog in installbsd scoinst install; do ! if test -f $ac_dir/$ac_prog; then ! if test $ac_prog = install && ! grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then ! # AIX install. It has an incompatible calling convention. ! # OSF/1 installbsd also uses dspmsg, but is usable. ! : ! else ! INSTALL="$ac_dir/$ac_prog -c" ! break 2 ! fi fi ! done ;; esac done ! IFS="$ac_save_ifs" ! fi ! ! if test -z "$INSTALL"; then ! # As a last resort, use the slow shell script. ! for ac_dir in ${srcdir} ${srcdir}/.. ${srcdir}/../..; do ! if test -f $ac_dir/install.sh; then ! INSTALL="$ac_dir/install.sh -c"; break ! fi ! done ! fi ! if test -z "$INSTALL"; then ! echo "configure: can not find install.sh in ${srcdir} or ${srcdir}/.. or ${srcdir}/../.." >&2; exit 1 fi test -n "$verbose" && echo " setting INSTALL to $INSTALL" ! ! # Use test -z because SunOS4 sh mishandles ${INSTALL_PROGRAM-'${INSTALL}'}. ! # It thinks the first close brace ends the variable substitution. ! test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' test -n "$verbose" && echo " setting INSTALL_PROGRAM to $INSTALL_PROGRAM" ! ! test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' test -n "$verbose" && echo " setting INSTALL_DATA to $INSTALL_DATA" if test -z "$RANLIB"; then # Extract the first word of `ranlib', so it can be a program name with args. ! set ac_dummy ranlib; ac_word=$2 ! test -n "$silent" || echo "checking for $ac_word" ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do ! test -z "$ac_dir" && ac_dir=. ! if test -f $ac_dir/$ac_word; then RANLIB="ranlib" break fi done ! IFS="$ac_save_ifs" fi test -z "$RANLIB" && RANLIB=":" *************** *** 248,253 **** ! ! echo checking for POSIXized ISC if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 --- 473,477 ---- ! test -n "$silent" || echo "checking for POSIXized ISC" if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 *************** *** 258,266 **** test -n "$verbose" && \ echo " defining _POSIX_SOURCE" ! echo "#define" _POSIX_SOURCE 1 >> confdefs.h DEFS="$DEFS -D_POSIX_SOURCE=1" ! SEDDEFS="${SEDDEFS}\${SEDdA}_POSIX_SOURCE\${SEDdB}_POSIX_SOURCE\${SEDdC}1\${SEDdD} ! \${SEDuA}_POSIX_SOURCE\${SEDuB}_POSIX_SOURCE\${SEDuC}1\${SEDuD} ! \${SEDeA}_POSIX_SOURCE\${SEDeB}_POSIX_SOURCE\${SEDeC}1\${SEDeD} " } --- 482,490 ---- test -n "$verbose" && \ echo " defining _POSIX_SOURCE" ! echo "#define" _POSIX_SOURCE "1" >> confdefs.h DEFS="$DEFS -D_POSIX_SOURCE=1" ! ac_sed_defs="${ac_sed_defs}\${ac_dA}_POSIX_SOURCE\${ac_dB}_POSIX_SOURCE\${ac_dC}1\${ac_dD} ! \${ac_uA}_POSIX_SOURCE\${ac_uB}_POSIX_SOURCE\${ac_uC}1\${ac_uD} ! \${ac_eA}_POSIX_SOURCE\${ac_eB}_POSIX_SOURCE\${ac_eC}1\${ac_eD} " } *************** *** 274,289 **** ! echo checking for directory library header ! dirheader= ! if test -z "$dirheader"; then ! echo checking for dirent.h ! cat > conftest.c <<EOF #include "confdefs.h" #include <sys/types.h> #include <dirent.h> ! int main() { exit(0); } ! int t() { DIR *dirp = 0; } EOF ! if eval $compile; then rm -rf conftest* --- 498,513 ---- ! test -n "$silent" || echo "checking for directory library header" ! ac_dir_header= ! if test -z "$ac_dir_header"; then ! test -n "$silent" || echo "checking for dirent.h" ! cat > conftest.${ac_ext} <<EOF #include "confdefs.h" #include <sys/types.h> #include <dirent.h> ! int main() { return 0; } ! int t() { DIR *dirp = 0;; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* *************** *** 291,316 **** test -n "$verbose" && \ echo " defining DIRENT" ! echo "#define" DIRENT 1 >> confdefs.h DEFS="$DEFS -DDIRENT=1" ! SEDDEFS="${SEDDEFS}\${SEDdA}DIRENT\${SEDdB}DIRENT\${SEDdC}1\${SEDdD} ! \${SEDuA}DIRENT\${SEDuB}DIRENT\${SEDuC}1\${SEDuD} ! \${SEDeA}DIRENT\${SEDeB}DIRENT\${SEDeC}1\${SEDeD} " } ! dirheader=dirent.h fi rm -f conftest* fi ! if test -z "$dirheader"; then ! echo checking for sys/ndir.h ! cat > conftest.c <<EOF #include "confdefs.h" #include <sys/types.h> #include <sys/ndir.h> ! int main() { exit(0); } ! int t() { DIR *dirp = 0; } EOF ! if eval $compile; then rm -rf conftest* --- 515,540 ---- test -n "$verbose" && \ echo " defining DIRENT" ! echo "#define" DIRENT "1" >> confdefs.h DEFS="$DEFS -DDIRENT=1" ! ac_sed_defs="${ac_sed_defs}\${ac_dA}DIRENT\${ac_dB}DIRENT\${ac_dC}1\${ac_dD} ! \${ac_uA}DIRENT\${ac_uB}DIRENT\${ac_uC}1\${ac_uD} ! \${ac_eA}DIRENT\${ac_eB}DIRENT\${ac_eC}1\${ac_eD} " } ! ac_dir_header=dirent.h fi rm -f conftest* fi ! if test -z "$ac_dir_header"; then ! test -n "$silent" || echo "checking for sys/ndir.h" ! cat > conftest.${ac_ext} <<EOF #include "confdefs.h" #include <sys/types.h> #include <sys/ndir.h> ! int main() { return 0; } ! int t() { DIR *dirp = 0;; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* *************** *** 318,343 **** test -n "$verbose" && \ echo " defining SYSNDIR" ! echo "#define" SYSNDIR 1 >> confdefs.h DEFS="$DEFS -DSYSNDIR=1" ! SEDDEFS="${SEDDEFS}\${SEDdA}SYSNDIR\${SEDdB}SYSNDIR\${SEDdC}1\${SEDdD} ! \${SEDuA}SYSNDIR\${SEDuB}SYSNDIR\${SEDuC}1\${SEDuD} ! \${SEDeA}SYSNDIR\${SEDeB}SYSNDIR\${SEDeC}1\${SEDeD} " } ! dirheader=sys/ndir.h fi rm -f conftest* fi ! if test -z "$dirheader"; then ! echo checking for sys/dir.h ! cat > conftest.c <<EOF #include "confdefs.h" #include <sys/types.h> #include <sys/dir.h> ! int main() { exit(0); } ! int t() { DIR *dirp = 0; } EOF ! if eval $compile; then rm -rf conftest* --- 542,567 ---- test -n "$verbose" && \ echo " defining SYSNDIR" ! echo "#define" SYSNDIR "1" >> confdefs.h DEFS="$DEFS -DSYSNDIR=1" ! ac_sed_defs="${ac_sed_defs}\${ac_dA}SYSNDIR\${ac_dB}SYSNDIR\${ac_dC}1\${ac_dD} ! \${ac_uA}SYSNDIR\${ac_uB}SYSNDIR\${ac_uC}1\${ac_uD} ! \${ac_eA}SYSNDIR\${ac_eB}SYSNDIR\${ac_eC}1\${ac_eD} " } ! ac_dir_header=sys/ndir.h fi rm -f conftest* fi ! if test -z "$ac_dir_header"; then ! test -n "$silent" || echo "checking for sys/dir.h" ! cat > conftest.${ac_ext} <<EOF #include "confdefs.h" #include <sys/types.h> #include <sys/dir.h> ! int main() { return 0; } ! int t() { DIR *dirp = 0;; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* *************** *** 345,370 **** test -n "$verbose" && \ echo " defining SYSDIR" ! echo "#define" SYSDIR 1 >> confdefs.h DEFS="$DEFS -DSYSDIR=1" ! SEDDEFS="${SEDDEFS}\${SEDdA}SYSDIR\${SEDdB}SYSDIR\${SEDdC}1\${SEDdD} ! \${SEDuA}SYSDIR\${SEDuB}SYSDIR\${SEDuC}1\${SEDuD} ! \${SEDeA}SYSDIR\${SEDeB}SYSDIR\${SEDeC}1\${SEDeD} " } ! dirheader=sys/dir.h fi rm -f conftest* fi ! if test -z "$dirheader"; then ! echo checking for ndir.h ! cat > conftest.c <<EOF #include "confdefs.h" #include <sys/types.h> #include <ndir.h> ! int main() { exit(0); } ! int t() { DIR *dirp = 0; } EOF ! if eval $compile; then rm -rf conftest* --- 569,594 ---- test -n "$verbose" && \ echo " defining SYSDIR" ! echo "#define" SYSDIR "1" >> confdefs.h DEFS="$DEFS -DSYSDIR=1" ! ac_sed_defs="${ac_sed_defs}\${ac_dA}SYSDIR\${ac_dB}SYSDIR\${ac_dC}1\${ac_dD} ! \${ac_uA}SYSDIR\${ac_uB}SYSDIR\${ac_uC}1\${ac_uD} ! \${ac_eA}SYSDIR\${ac_eB}SYSDIR\${ac_eC}1\${ac_eD} " } ! ac_dir_header=sys/dir.h fi rm -f conftest* fi ! if test -z "$ac_dir_header"; then ! test -n "$silent" || echo "checking for ndir.h" ! cat > conftest.${ac_ext} <<EOF #include "confdefs.h" #include <sys/types.h> #include <ndir.h> ! int main() { return 0; } ! int t() { DIR *dirp = 0;; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* *************** *** 372,383 **** test -n "$verbose" && \ echo " defining NDIR" ! echo "#define" NDIR 1 >> confdefs.h DEFS="$DEFS -DNDIR=1" ! SEDDEFS="${SEDDEFS}\${SEDdA}NDIR\${SEDdB}NDIR\${SEDdC}1\${SEDdD} ! \${SEDuA}NDIR\${SEDuB}NDIR\${SEDuC}1\${SEDuD} ! \${SEDeA}NDIR\${SEDeB}NDIR\${SEDeC}1\${SEDeD} " } ! dirheader=ndir.h fi --- 596,607 ---- test -n "$verbose" && \ echo " defining NDIR" ! echo "#define" NDIR "1" >> confdefs.h DEFS="$DEFS -DNDIR=1" ! ac_sed_defs="${ac_sed_defs}\${ac_dA}NDIR\${ac_dB}NDIR\${ac_dC}1\${ac_dD} ! \${ac_uA}NDIR\${ac_uB}NDIR\${ac_uC}1\${ac_uD} ! \${ac_eA}NDIR\${ac_eB}NDIR\${ac_eC}1\${ac_eD} " } ! ac_dir_header=ndir.h fi *************** *** 385,396 **** fi ! echo checking for closedir return value ! cat > conftest.c <<EOF #include "confdefs.h" #include <sys/types.h> ! #include <$dirheader> int closedir(); main() { exit(closedir(opendir(".")) != 0); } EOF ! eval $compile if test -s conftest && (./conftest; exit) 2>/dev/null; then : --- 609,620 ---- fi ! test -n "$silent" || echo "checking for closedir return value" ! cat > conftest.${ac_ext} <<EOF #include "confdefs.h" #include <sys/types.h> ! #include <$ac_dir_header> int closedir(); main() { exit(closedir(opendir(".")) != 0); } EOF ! eval $ac_compile if test -s conftest && (./conftest; exit) 2>/dev/null; then : *************** *** 400,408 **** test -n "$verbose" && \ echo " defining VOID_CLOSEDIR" ! echo "#define" VOID_CLOSEDIR 1 >> confdefs.h DEFS="$DEFS -DVOID_CLOSEDIR=1" ! SEDDEFS="${SEDDEFS}\${SEDdA}VOID_CLOSEDIR\${SEDdB}VOID_CLOSEDIR\${SEDdC}1\${SEDdD} ! \${SEDuA}VOID_CLOSEDIR\${SEDuB}VOID_CLOSEDIR\${SEDuC}1\${SEDuD} ! \${SEDeA}VOID_CLOSEDIR\${SEDeB}VOID_CLOSEDIR\${SEDeC}1\${SEDeD} " } --- 624,632 ---- test -n "$verbose" && \ echo " defining VOID_CLOSEDIR" ! echo "#define" VOID_CLOSEDIR "1" >> confdefs.h DEFS="$DEFS -DVOID_CLOSEDIR=1" ! ac_sed_defs="${ac_sed_defs}\${ac_dA}VOID_CLOSEDIR\${ac_dB}VOID_CLOSEDIR\${ac_dC}1\${ac_dD} ! \${ac_uA}VOID_CLOSEDIR\${ac_uB}VOID_CLOSEDIR\${ac_uC}1\${ac_uD} ! \${ac_eA}VOID_CLOSEDIR\${ac_eB}VOID_CLOSEDIR\${ac_eC}1\${ac_eD} " } *************** *** 411,416 **** rm -fr conftest* ! echo checking for Xenix ! cat > conftest.c <<EOF #include "confdefs.h" #if defined(M_XENIX) && !defined(M_UNIX) --- 635,640 ---- rm -fr conftest* ! test -n "$silent" || echo "checking for Xenix" ! cat > conftest.${ac_ext} <<EOF #include "confdefs.h" #if defined(M_XENIX) && !defined(M_UNIX) *************** *** 419,423 **** EOF ! eval "$CPP conftest.c > conftest.out 2>&1" if egrep "yes" conftest.out >/dev/null 2>&1; then rm -rf conftest* --- 643,647 ---- EOF ! eval "$ac_cpp conftest.${ac_ext} > conftest.out 2>&1" if egrep "yes" conftest.out >/dev/null 2>&1; then rm -rf conftest* *************** *** 435,440 **** fi ! echo checking for ANSI C header files ! cat > conftest.c <<EOF #include "confdefs.h" #include <stdlib.h> --- 659,664 ---- fi ! test -n "$silent" || echo "checking for ANSI C header files" ! cat > conftest.${ac_ext} <<EOF #include "confdefs.h" #include <stdlib.h> *************** *** 443,457 **** #include <float.h> EOF ! err=`eval "($CPP conftest.c >/dev/null) 2>&1"` ! if test -z "$err"; then rm -rf conftest* # SunOS 4.x string.h does not declare mem*, contrary to ANSI. echo '#include "confdefs.h" ! #include <string.h>' > conftest.c ! eval "$CPP conftest.c > conftest.out 2>&1" if egrep "memchr" conftest.out >/dev/null 2>&1; then rm -rf conftest* # SGI's /bin/cc from Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. ! cat > conftest.c <<EOF #include "confdefs.h" #include <ctype.h> --- 667,683 ---- #include <float.h> EOF ! # Some shells (Coherent) do redirections in the wrong order, so need ! # the parens. ! ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"` ! if test -z "$ac_err"; then rm -rf conftest* # SunOS 4.x string.h does not declare mem*, contrary to ANSI. echo '#include "confdefs.h" ! #include <string.h>' > conftest.${ac_ext} ! eval "$ac_cpp conftest.${ac_ext} > conftest.out 2>&1" if egrep "memchr" conftest.out >/dev/null 2>&1; then rm -rf conftest* # SGI's /bin/cc from Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. ! cat > conftest.${ac_ext} <<EOF #include "confdefs.h" #include <ctype.h> *************** *** 464,478 **** EOF ! eval $compile if test -s conftest && (./conftest; exit) 2>/dev/null; then { test -n "$verbose" && \ echo " defining STDC_HEADERS" ! echo "#define" STDC_HEADERS 1 >> confdefs.h DEFS="$DEFS -DSTDC_HEADERS=1" ! SEDDEFS="${SEDDEFS}\${SEDdA}STDC_HEADERS\${SEDdB}STDC_HEADERS\${SEDdC}1\${SEDdD} ! \${SEDuA}STDC_HEADERS\${SEDuB}STDC_HEADERS\${SEDuC}1\${SEDuD} ! \${SEDeA}STDC_HEADERS\${SEDeB}STDC_HEADERS\${SEDeC}1\${SEDeD} " } --- 690,710 ---- EOF ! eval $ac_compile if test -s conftest && (./conftest; exit) 2>/dev/null; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + echo '#include "confdefs.h" + #include <stdlib.h>' > conftest.${ac_ext} + eval "$ac_cpp conftest.${ac_ext} > conftest.out 2>&1" + if egrep "free" conftest.out >/dev/null 2>&1; then + rm -rf conftest* { test -n "$verbose" && \ echo " defining STDC_HEADERS" ! echo "#define" STDC_HEADERS "1" >> confdefs.h DEFS="$DEFS -DSTDC_HEADERS=1" ! ac_sed_defs="${ac_sed_defs}\${ac_dA}STDC_HEADERS\${ac_dB}STDC_HEADERS\${ac_dC}1\${ac_dD} ! \${ac_uA}STDC_HEADERS\${ac_uB}STDC_HEADERS\${ac_uC}1\${ac_uD} ! \${ac_eA}STDC_HEADERS\${ac_eB}STDC_HEADERS\${ac_eC}1\${ac_eD} " } *************** *** 480,483 **** --- 712,719 ---- fi + rm -f conftest* + + + fi rm -fr conftest* *************** *** 489,513 **** rm -f conftest* ! for hdr in assert.h float.h limits.h memory.h pwd.h stdlib.h \ string.h unistd.h do ! trhdr=HAVE_`echo $hdr | tr '[a-z]./' '[A-Z]__'` ! echo checking for ${hdr} ! cat > conftest.c <<EOF ! #include "confdefs.h" ! #include <${hdr}> ! EOF ! err=`eval "($CPP conftest.c >/dev/null) 2>&1"` ! if test -z "$err"; then rm -rf conftest* { test -n "$verbose" && \ ! echo " defining ${trhdr}" ! echo "#define" ${trhdr} 1 >> confdefs.h ! DEFS="$DEFS -D${trhdr}=1" ! SEDDEFS="${SEDDEFS}\${SEDdA}${trhdr}\${SEDdB}${trhdr}\${SEDdC}1\${SEDdD} ! \${SEDuA}${trhdr}\${SEDuB}${trhdr}\${SEDuC}1\${SEDuD} ! \${SEDeA}${trhdr}\${SEDeB}${trhdr}\${SEDeC}1\${SEDeD} " } --- 725,751 ---- rm -f conftest* ! for ac_hdr in assert.h float.h limits.h memory.h pwd.h stdlib.h \ string.h unistd.h do ! ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./' '[A-Z]__'` ! test -n "$silent" || echo "checking for ${ac_hdr}" ! cat > conftest.${ac_ext} <<EOF ! #include "confdefs.h" ! #include <${ac_hdr}> ! EOF ! # Some shells (Coherent) do redirections in the wrong order, so need ! # the parens. ! ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"` ! if test -z "$ac_err"; then rm -rf conftest* { test -n "$verbose" && \ ! echo " defining ${ac_tr_hdr}" ! echo "#define" ${ac_tr_hdr} "1" >> confdefs.h ! DEFS="$DEFS -D${ac_tr_hdr}=1" ! ac_sed_defs="${ac_sed_defs}\${ac_dA}${ac_tr_hdr}\${ac_dB}${ac_tr_hdr}\${ac_dC}1\${ac_dD} ! \${ac_uA}${ac_tr_hdr}\${ac_uB}${ac_tr_hdr}\${ac_uC}1\${ac_uD} ! \${ac_eA}${ac_tr_hdr}\${ac_eB}${ac_tr_hdr}\${ac_eC}1\${ac_eD} " } *************** *** 519,552 **** ! for func in memmove putenv do ! trfunc=HAVE_`echo $func | tr '[a-z]' '[A-Z]'` ! echo checking for ${func} ! cat > conftest.c <<EOF #include "confdefs.h" #include <ctype.h> ! int main() { exit(0); } int t() { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ ! #if defined (__stub_${func}) || defined (__stub___${func}) choke me #else /* Override any gcc2 internal prototype to avoid an error. */ ! extern char ${func}(); ${func}(); #endif ! } EOF ! if eval $compile; then rm -rf conftest* { test -n "$verbose" && \ ! echo " defining ${trfunc}" ! echo "#define" ${trfunc} 1 >> confdefs.h ! DEFS="$DEFS -D${trfunc}=1" ! SEDDEFS="${SEDDEFS}\${SEDdA}${trfunc}\${SEDdB}${trfunc}\${SEDdC}1\${SEDdD} ! \${SEDuA}${trfunc}\${SEDuB}${trfunc}\${SEDuC}1\${SEDuD} ! \${SEDeA}${trfunc}\${SEDeB}${trfunc}\${SEDeC}1\${SEDeD} " } --- 757,790 ---- ! for ac_func in bcopy memmove putenv do ! ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'` ! test -n "$silent" || echo "checking for ${ac_func}" ! cat > conftest.${ac_ext} <<EOF #include "confdefs.h" #include <ctype.h> ! int main() { return 0; } int t() { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ ! #if defined (__stub_${ac_func}) || defined (__stub___${ac_func}) choke me #else /* Override any gcc2 internal prototype to avoid an error. */ ! extern char ${ac_func}(); ${ac_func}(); #endif ! ; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* { test -n "$verbose" && \ ! echo " defining ${ac_tr_func}" ! echo "#define" ${ac_tr_func} "1" >> confdefs.h ! DEFS="$DEFS -D${ac_tr_func}=1" ! ac_sed_defs="${ac_sed_defs}\${ac_dA}${ac_tr_func}\${ac_dB}${ac_tr_func}\${ac_dC}1\${ac_dD} ! \${ac_uA}${ac_tr_func}\${ac_uB}${ac_tr_func}\${ac_uC}1\${ac_uD} ! \${ac_eA}${ac_tr_func}\${ac_eB}${ac_tr_func}\${ac_eC}1\${ac_eD} " } *************** *** 557,562 **** done ! ! prog='/* Ultrix mips cc rejects this. */ typedef int charset[2]; const charset x; /* SunOS 4.1.1 cc rejects this. */ --- 795,799 ---- done ! ac_prog='/* Ultrix mips cc rejects this. */ typedef int charset[2]; const charset x; /* SunOS 4.1.1 cc rejects this. */ *************** *** 596,607 **** const int foo = 10; }' ! echo checking for lack of working const ! cat > conftest.c <<EOF #include "confdefs.h" ! int main() { exit(0); } ! int t() { $prog } EOF ! if eval $compile; then : else --- 833,844 ---- const int foo = 10; }' ! test -n "$silent" || echo "checking for lack of working const" ! cat > conftest.${ac_ext} <<EOF #include "confdefs.h" ! int main() { return 0; } ! int t() { $ac_prog; return 0; } EOF ! if eval $ac_compile; then : else *************** *** 611,644 **** test -n "$verbose" && \ echo " defining" const to be empty ! echo "#define" const >> confdefs.h DEFS="$DEFS -Dconst=" ! SEDDEFS="${SEDDEFS}\${SEDdA}const\${SEDdB}const\${SEDdC}\${SEDdD} ! \${SEDuA}const\${SEDuB}const\${SEDuC}\${SEDuD} ! \${SEDeA}const\${SEDeB}const\${SEDeC}\${SEDeD} " } fi rm -f conftest* ! for p in 'bison -y' byacc do if test -z "$YACC"; then ! # Extract the first word of `$p', so it can be a program name with args. ! set dummy $p; word=$2 ! echo checking for $word ! IFS="${IFS= }"; saveifs="$IFS"; IFS="${IFS}:" ! for dir in $PATH; do ! test -z "$dir" && dir=. ! if test -f $dir/$word; then ! YACC="$p" break fi done ! IFS="$saveifs" fi --- 848,989 ---- test -n "$verbose" && \ echo " defining" const to be empty ! echo "#define" const "" >> confdefs.h DEFS="$DEFS -Dconst=" ! ac_sed_defs="${ac_sed_defs}\${ac_dA}const\${ac_dB}const\${ac_dC}\${ac_dD} ! \${ac_uA}const\${ac_uB}const\${ac_uC}\${ac_uD} ! \${ac_eA}const\${ac_eB}const\${ac_eC}\${ac_eD} ! " ! } ! ! fi ! rm -f conftest* ! ! ! ! # GNU libc predefines `program_invocation_name'. ! test -n "$silent" || echo "checking for program_invocation_name" ! cat > conftest.${ac_ext} <<EOF ! #include "confdefs.h" ! ! int main() { return 0; } ! int t() { main() { program_invocation_name = "hello"; }; return 0; } ! EOF ! if eval $ac_compile; then ! rm -rf conftest* ! ! { ! test -n "$verbose" && \ ! echo " defining HAVE_PROGRAM_INVOCATION_NAME" ! echo "#define" HAVE_PROGRAM_INVOCATION_NAME "1" >> confdefs.h ! DEFS="$DEFS -DHAVE_PROGRAM_INVOCATION_NAME=1" ! ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_PROGRAM_INVOCATION_NAME\${ac_dB}HAVE_PROGRAM_INVOCATION_NAME\${ac_dC}1\${ac_dD} ! \${ac_uA}HAVE_PROGRAM_INVOCATION_NAME\${ac_uB}HAVE_PROGRAM_INVOCATION_NAME\${ac_uC}1\${ac_uD} ! \${ac_eA}HAVE_PROGRAM_INVOCATION_NAME\${ac_eB}HAVE_PROGRAM_INVOCATION_NAME\${ac_eC}1\${ac_eD} " } + + fi rm -f conftest* + # Some BSD systems do malloc/free's on the environment. + # This test program is due to Mike Hibler <mike@cs.utah.edu>. + test -n "$silent" || echo "checking for smart putenv" + cat > conftest.${ac_ext} <<EOF + #include "confdefs.h" + + int main() { return 0; } + int t() { + #define VAR "YOW_VAR" + #define STRING1 "GabbaGabbaHey" + #define STRING2 "Yow!!" /* should be shorter than STRING1 */ + extern char *getenv (); /* in case char* and int don't mix gracefully */ + main () + { + char *str1, *rstr1, *str2, *rstr2; + str1 = getenv (VAR); + if (str1) + exit (1); + str1 = malloc (strlen (VAR) + 1 + strlen (STRING1) + 1); + if (str1 == 0) + exit (2); + strcpy (str1, VAR); + strcat (str1, "="); + strcat (str1, STRING1); + if (putenv (str1) < 0) + exit (3); + rstr1 = getenv (VAR); + if (rstr1 == 0) + exit (4); + rstr1 -= strlen (VAR) + 1; + if (strncmp (rstr1, VAR, strlen (VAR))) + exit (5); + str2 = malloc (strlen (VAR) + 1 + strlen (STRING2) + 1); + if (str2 == 0 || str1 == str2) + exit (6); + strcpy (str2, VAR); + strcat (str2, "="); + strcat (str2, STRING2); + if (putenv (str2) < 0) + exit (7); + rstr2 = getenv (VAR); + if (rstr2 == 0) + exit (8); + rstr2 -= strlen (VAR) + 1; + #if 0 + printf ("rstr1=0x%x, rstr2=0x%x\n", rstr1, rstr2); + /* + * If string from first call was reused for the second call, + * you had better not do a free on the first string! + */ + if (rstr1 == rstr2) + printf ("#define\tSMART_PUTENV\n"); + else + printf ("#undef\tSMART_PUTENV\n"); + #endif + + exit (rstr1 == rstr2 ? 0 : 1); + } + ; return 0; } + EOF + if eval $ac_compile; then + rm -rf conftest* + + { + test -n "$verbose" && \ + echo " defining " + echo "#define" "1" >> confdefs.h + DEFS="$DEFS -D=1" + ac_sed_defs="${ac_sed_defs}\${ac_dA}\${ac_dB}\${ac_dC}1\${ac_dD} + \${ac_uA}\${ac_uB}\${ac_uC}1\${ac_uD} + \${ac_eA}\${ac_eB}\${ac_eC}1\${ac_eD} + " + } + (SMART_PUTENV) + + + fi + rm -f conftest* ! ! for ac_prog in 'bison -y' byacc do if test -z "$YACC"; then ! # Extract the first word of `$ac_prog', so it can be a program name with args. ! set ac_dummy $ac_prog; ac_word=$2 ! test -n "$silent" || echo "checking for $ac_word" ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do ! test -z "$ac_dir" && ac_dir=. ! if test -f $ac_dir/$ac_word; then ! YACC="$ac_prog" break fi done ! IFS="$ac_save_ifs" fi *************** *** 651,665 **** if test -z "$LEX"; then # Extract the first word of `flex', so it can be a program name with args. ! set dummy flex; word=$2 ! echo checking for $word ! IFS="${IFS= }"; saveifs="$IFS"; IFS="${IFS}:" ! for dir in $PATH; do ! test -z "$dir" && dir=. ! if test -f $dir/$word; then LEX="flex" break fi done ! IFS="$saveifs" fi test -z "$LEX" && LEX="lex" --- 996,1010 ---- if test -z "$LEX"; then # Extract the first word of `flex', so it can be a program name with args. ! set ac_dummy flex; ac_word=$2 ! test -n "$silent" || echo "checking for $ac_word" ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do ! test -z "$ac_dir" && ac_dir=. ! if test -f $ac_dir/$ac_word; then LEX="flex" break fi done ! IFS="$ac_save_ifs" fi test -z "$LEX" && LEX="lex" *************** *** 669,690 **** then case "$LEX" in ! flex*) LIBS_save="${LIBS}" LIBS="${LIBS} -lfl" ! have_lib="" ! echo checking for -lfl ! cat > conftest.c <<EOF #include "confdefs.h" ! int main() { exit(0); } ! int t() { main(); } EOF ! if eval $compile; then rm -rf conftest* ! have_lib="1" fi rm -f conftest* ! LIBS="${LIBS_save}" ! if test -n "${have_lib}"; then :; LEXLIB="-lfl" else --- 1014,1035 ---- then case "$LEX" in ! flex*) ac_save_LIBS="${LIBS}" LIBS="${LIBS} -lfl" ! ac_have_lib="" ! test -n "$silent" || echo "checking for -lfl" ! cat > conftest.${ac_ext} <<EOF #include "confdefs.h" ! int main() { return 0; } ! int t() { main();; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* ! ac_have_lib="1" fi rm -f conftest* ! LIBS="${ac_save_LIBS}" ! if test -n "${ac_have_lib}"; then :; LEXLIB="-lfl" else *************** *** 695,700 **** esac fi ! echo checking for ln -s rm -f conftestdata if ln -s X conftestdata 2>/dev/null --- 1040,1046 ---- esac fi + test -n "$verbose" && echo " setting LEXLIB to $LEXLIB" ! test -n "$silent" || echo "checking for ln -s" rm -f conftestdata if ln -s X conftestdata 2>/dev/null *************** *** 708,713 **** ! echo checking for return type of signal handlers ! cat > conftest.c <<EOF #include "confdefs.h" #include <sys/types.h> --- 1054,1059 ---- ! test -n "$silent" || echo "checking for return type of signal handlers" ! cat > conftest.${ac_ext} <<EOF #include "confdefs.h" #include <sys/types.h> *************** *** 717,734 **** #endif extern void (*signal ()) (); ! int main() { exit(0); } ! int t() { int i; } EOF ! if eval $compile; then rm -rf conftest* { test -n "$verbose" && \ ! echo " defining" RETSIGTYPE to be void ! echo "#define" RETSIGTYPE void >> confdefs.h DEFS="$DEFS -DRETSIGTYPE=void" ! SEDDEFS="${SEDDEFS}\${SEDdA}RETSIGTYPE\${SEDdB}RETSIGTYPE\${SEDdC}void\${SEDdD} ! \${SEDuA}RETSIGTYPE\${SEDuB}RETSIGTYPE\${SEDuC}void\${SEDuD} ! \${SEDeA}RETSIGTYPE\${SEDeB}RETSIGTYPE\${SEDeC}void\${SEDeD} " } --- 1063,1080 ---- #endif extern void (*signal ()) (); ! int main() { return 0; } ! int t() { int i;; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* { test -n "$verbose" && \ ! echo " defining" RETSIGTYPE to be "void" ! echo "#define" RETSIGTYPE "void" >> confdefs.h DEFS="$DEFS -DRETSIGTYPE=void" ! ac_sed_defs="${ac_sed_defs}\${ac_dA}RETSIGTYPE\${ac_dB}RETSIGTYPE\${ac_dC}void\${ac_dD} ! \${ac_uA}RETSIGTYPE\${ac_uB}RETSIGTYPE\${ac_uC}void\${ac_uD} ! \${ac_eA}RETSIGTYPE\${ac_eB}RETSIGTYPE\${ac_eC}void\${ac_eD} " } *************** *** 740,749 **** { test -n "$verbose" && \ ! echo " defining" RETSIGTYPE to be int ! echo "#define" RETSIGTYPE int >> confdefs.h DEFS="$DEFS -DRETSIGTYPE=int" ! SEDDEFS="${SEDDEFS}\${SEDdA}RETSIGTYPE\${SEDdB}RETSIGTYPE\${SEDdC}int\${SEDdD} ! \${SEDuA}RETSIGTYPE\${SEDuB}RETSIGTYPE\${SEDuC}int\${SEDuD} ! \${SEDeA}RETSIGTYPE\${SEDeB}RETSIGTYPE\${SEDeC}int\${SEDeD} " } --- 1086,1095 ---- { test -n "$verbose" && \ ! echo " defining" RETSIGTYPE to be "int" ! echo "#define" RETSIGTYPE "int" >> confdefs.h DEFS="$DEFS -DRETSIGTYPE=int" ! ac_sed_defs="${ac_sed_defs}\${ac_dA}RETSIGTYPE\${ac_dB}RETSIGTYPE\${ac_dC}int\${ac_dD} ! \${ac_uA}RETSIGTYPE\${ac_uB}RETSIGTYPE\${ac_uC}int\${ac_uD} ! \${ac_eA}RETSIGTYPE\${ac_eB}RETSIGTYPE\${ac_eC}int\${ac_eD} " } *************** *** 754,759 **** ! echo checking for unsigned characters ! cat > conftest.c <<EOF #include "confdefs.h" /* volatile prevents gcc2 from optimizing the test away on sparcs. */ --- 1100,1105 ---- ! test -n "$silent" || echo "checking for unsigned characters" ! cat > conftest.${ac_ext} <<EOF #include "confdefs.h" /* volatile prevents gcc2 from optimizing the test away on sparcs. */ *************** *** 769,773 **** } EOF ! eval $compile if test -s conftest && (./conftest; exit) 2>/dev/null; then --- 1115,1119 ---- } EOF ! eval $ac_compile if test -s conftest && (./conftest; exit) 2>/dev/null; then *************** *** 775,783 **** test -n "$verbose" && \ echo " defining __CHAR_UNSIGNED__" ! echo "#define" __CHAR_UNSIGNED__ 1 >> confdefs.h DEFS="$DEFS -D__CHAR_UNSIGNED__=1" ! SEDDEFS="${SEDDEFS}\${SEDdA}__CHAR_UNSIGNED__\${SEDdB}__CHAR_UNSIGNED__\${SEDdC}1\${SEDdD} ! \${SEDuA}__CHAR_UNSIGNED__\${SEDuB}__CHAR_UNSIGNED__\${SEDuC}1\${SEDuD} ! \${SEDeA}__CHAR_UNSIGNED__\${SEDeB}__CHAR_UNSIGNED__\${SEDeC}1\${SEDeD} " } --- 1121,1129 ---- test -n "$verbose" && \ echo " defining __CHAR_UNSIGNED__" ! echo "#define" __CHAR_UNSIGNED__ "1" >> confdefs.h DEFS="$DEFS -D__CHAR_UNSIGNED__=1" ! ac_sed_defs="${ac_sed_defs}\${ac_dA}__CHAR_UNSIGNED__\${ac_dB}__CHAR_UNSIGNED__\${ac_dC}1\${ac_dD} ! \${ac_uA}__CHAR_UNSIGNED__\${ac_uB}__CHAR_UNSIGNED__\${ac_uC}1\${ac_uD} ! \${ac_eA}__CHAR_UNSIGNED__\${ac_eB}__CHAR_UNSIGNED__\${ac_eC}1\${ac_eD} " } *************** *** 787,796 **** rm -fr conftest* ! echo checking for 64-bit long ints ! cat > conftest.c <<EOF #include "confdefs.h" main() { exit(sizeof(long int) != 8); } EOF ! eval $compile if test -s conftest && (./conftest; exit) 2>/dev/null; then --- 1133,1143 ---- rm -fr conftest* ! ! test -n "$silent" || echo "checking for 64-bit long ints" ! cat > conftest.${ac_ext} <<EOF #include "confdefs.h" main() { exit(sizeof(long int) != 8); } EOF ! eval $ac_compile if test -s conftest && (./conftest; exit) 2>/dev/null; then *************** *** 798,806 **** test -n "$verbose" && \ echo " defining LONG_64_BITS" ! echo "#define" LONG_64_BITS 1 >> confdefs.h DEFS="$DEFS -DLONG_64_BITS=1" ! SEDDEFS="${SEDDEFS}\${SEDdA}LONG_64_BITS\${SEDdB}LONG_64_BITS\${SEDdC}1\${SEDdD} ! \${SEDuA}LONG_64_BITS\${SEDuB}LONG_64_BITS\${SEDuC}1\${SEDuD} ! \${SEDeA}LONG_64_BITS\${SEDeB}LONG_64_BITS\${SEDeC}1\${SEDeD} " } --- 1145,1153 ---- test -n "$verbose" && \ echo " defining LONG_64_BITS" ! echo "#define" LONG_64_BITS "1" >> confdefs.h DEFS="$DEFS -DLONG_64_BITS=1" ! ac_sed_defs="${ac_sed_defs}\${ac_dA}LONG_64_BITS\${ac_dB}LONG_64_BITS\${ac_dC}1\${ac_dD} ! \${ac_uA}LONG_64_BITS\${ac_uB}LONG_64_BITS\${ac_uC}1\${ac_uD} ! \${ac_eA}LONG_64_BITS\${ac_eB}LONG_64_BITS\${ac_eC}1\${ac_eD} " } *************** *** 810,815 **** rm -fr conftest* ! echo checking byte ordering ! cat > conftest.c <<EOF #include "confdefs.h" main () { --- 1157,1162 ---- rm -fr conftest* ! test -n "$silent" || echo "checking byte ordering" ! cat > conftest.${ac_ext} <<EOF #include "confdefs.h" main () { *************** *** 824,828 **** } EOF ! eval $compile if test -s conftest && (./conftest; exit) 2>/dev/null; then : --- 1171,1175 ---- } EOF ! eval $ac_compile if test -s conftest && (./conftest; exit) 2>/dev/null; then : *************** *** 832,840 **** test -n "$verbose" && \ echo " defining WORDS_BIGENDIAN" ! echo "#define" WORDS_BIGENDIAN 1 >> confdefs.h DEFS="$DEFS -DWORDS_BIGENDIAN=1" ! SEDDEFS="${SEDDEFS}\${SEDdA}WORDS_BIGENDIAN\${SEDdB}WORDS_BIGENDIAN\${SEDdC}1\${SEDdD} ! \${SEDuA}WORDS_BIGENDIAN\${SEDuB}WORDS_BIGENDIAN\${SEDuC}1\${SEDuD} ! \${SEDeA}WORDS_BIGENDIAN\${SEDeB}WORDS_BIGENDIAN\${SEDeC}1\${SEDeD} " } --- 1179,1187 ---- test -n "$verbose" && \ echo " defining WORDS_BIGENDIAN" ! echo "#define" WORDS_BIGENDIAN "1" >> confdefs.h DEFS="$DEFS -DWORDS_BIGENDIAN=1" ! ac_sed_defs="${ac_sed_defs}\${ac_dA}WORDS_BIGENDIAN\${ac_dB}WORDS_BIGENDIAN\${ac_dC}1\${ac_dD} ! \${ac_uA}WORDS_BIGENDIAN\${ac_uB}WORDS_BIGENDIAN\${ac_uC}1\${ac_uD} ! \${ac_eA}WORDS_BIGENDIAN\${ac_eB}WORDS_BIGENDIAN\${ac_eC}1\${ac_eD} " } *************** *** 844,881 **** ! echo checking how to declare yytext ! # Figure out what yytext is by creating a minimal parser and ! # examining the (preprocessed, in case macros are used) output. ! if test "z${DECLARE_YYTEXT}" = "z"; then echo '%% %%' | ${LEX} ! if test -f lex.yy.c; then ! LEX_OUTPUT_ROOT=lex.yy ! elif test -f lexyy.c; then ! LEX_OUTPUT_ROOT=lexyy ! else ! # Don't know what to do here. ! echo "Can't find output from $LEX; assuming lex.yy.c." 1>&2 ! LEX_OUTPUT_ROOT=lex.yy ! fi ! DECLARE_YYTEXT=`eval ${CPP} "${LEX_OUTPUT_ROOT}.c" | ! sed -n '/extern.*yytext[^a-zA-Z0-9_]/s/^.*extern/extern/p'` ! rm -f "${LEX_OUTPUT_ROOT}.c" ! fi ! { test -n "$verbose" && \ ! echo " defining" DECLARE_YYTEXT to be $DECLARE_YYTEXT ! echo "#define" DECLARE_YYTEXT $DECLARE_YYTEXT >> confdefs.h ! DEFS="$DEFS -DDECLARE_YYTEXT=$DECLARE_YYTEXT" ! SEDDEFS="${SEDDEFS}\${SEDdA}DECLARE_YYTEXT\${SEDdB}DECLARE_YYTEXT\${SEDdC}$DECLARE_YYTEXT\${SEDdD} ! \${SEDuA}DECLARE_YYTEXT\${SEDuB}DECLARE_YYTEXT\${SEDuC}$DECLARE_YYTEXT\${SEDuD} ! \${SEDeA}DECLARE_YYTEXT\${SEDeB}DECLARE_YYTEXT\${SEDeC}$DECLARE_YYTEXT\${SEDeD} " } echo checking for window system libraries ! cat > conftest.c <<EOF #include "confdefs.h" #include "$srcdir/lib/c-auto.h.in" --- 1191,1244 ---- ! test -n "$silent" || echo "checking for yytext declaration" ! # POSIX says lex can declare yytext either as a pointer or an array; the ! # default is implementation-dependent. Figure out which it is, since ! # not all implementations provide the %pointer and %array declarations. ! # ! # The minimal lex program is just a single line: %%. But some broken lexes ! # (Solaris, I think it was) want two %% lines, so accommodate them. echo '%% %%' | ${LEX} ! if test -f lex.yy.c; then ! LEX_OUTPUT_ROOT=lex.yy ! elif test -f lexyy.c; then ! LEX_OUTPUT_ROOT=lexyy ! else ! # Don't know what to do here. ! echo "configure: cannot find output from $LEX" >&2; exit 1 ! LEX_OUTPUT_ROOT= ! fi ! if test -n "$LEX_OUTPUT_ROOT"; then ! echo 'extern char *yytext; main () { exit (0); }' >>$LEX_OUTPUT_ROOT.c ! ac_save_LIBS="$LIBS" ! LIBS="$LIBS $LEXLIB" ! cat > conftest.${ac_ext} <<EOF ! #include "confdefs.h" ! `cat $LEX_OUTPUT_ROOT.c` ! EOF ! eval $ac_compile ! if test -s conftest && (./conftest; exit) 2>/dev/null; then ! { test -n "$verbose" && \ ! echo " defining YYTEXT_POINTER" ! echo "#define" YYTEXT_POINTER "1" >> confdefs.h ! DEFS="$DEFS -DYYTEXT_POINTER=1" ! ac_sed_defs="${ac_sed_defs}\${ac_dA}YYTEXT_POINTER\${ac_dB}YYTEXT_POINTER\${ac_dC}1\${ac_dD} ! \${ac_uA}YYTEXT_POINTER\${ac_uB}YYTEXT_POINTER\${ac_uC}1\${ac_uD} ! \${ac_eA}YYTEXT_POINTER\${ac_eB}YYTEXT_POINTER\${ac_eC}1\${ac_eD} " } + fi + rm -fr conftest* + LIBS="$ac_save_LIBS" + rm -f "${LEX_OUTPUT_ROOT}.c" + fi + + echo checking for window system libraries ! cat > conftest.${ac_ext} <<EOF #include "confdefs.h" #include "$srcdir/lib/c-auto.h.in" *************** *** 885,890 **** EOF ! err=`eval "($CPP conftest.c >/dev/null) 2>&1"` ! if test -z "$err"; then rm -rf conftest* SUNWIN=t --- 1248,1255 ---- EOF ! # Some shells (Coherent) do redirections in the wrong order, so need ! # the parens. ! ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"` ! if test -z "$ac_err"; then rm -rf conftest* SUNWIN=t *************** *** 893,897 **** fi rm -f conftest* ! cat > conftest.c <<EOF #include "confdefs.h" #include "$srcdir/lib/c-auto.h.in" --- 1258,1262 ---- fi rm -f conftest* ! cat > conftest.${ac_ext} <<EOF #include "confdefs.h" #include "$srcdir/lib/c-auto.h.in" *************** *** 901,906 **** EOF ! err=`eval "($CPP conftest.c >/dev/null) 2>&1"` ! if test -z "$err"; then rm -rf conftest* XVIEWWIN=t --- 1266,1273 ---- EOF ! # Some shells (Coherent) do redirections in the wrong order, so need ! # the parens. ! ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"` ! if test -z "$ac_err"; then rm -rf conftest* XVIEWWIN=t *************** *** 909,913 **** fi rm -f conftest* ! cat > conftest.c <<EOF #include "confdefs.h" #include "$srcdir/lib/c-auto.h.in" --- 1276,1280 ---- fi rm -f conftest* ! cat > conftest.${ac_ext} <<EOF #include "confdefs.h" #include "$srcdir/lib/c-auto.h.in" *************** *** 917,922 **** EOF ! err=`eval "($CPP conftest.c >/dev/null) 2>&1"` ! if test -z "$err"; then rm -rf conftest* X11WIN=t --- 1284,1291 ---- EOF ! # Some shells (Coherent) do redirections in the wrong order, so need ! # the parens. ! ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"` ! if test -z "$ac_err"; then rm -rf conftest* X11WIN=t *************** *** 925,929 **** fi rm -f conftest* ! cat > conftest.c <<EOF #include "confdefs.h" #include "$srcdir/lib/c-auto.h.in" --- 1294,1298 ---- fi rm -f conftest* ! cat > conftest.${ac_ext} <<EOF #include "confdefs.h" #include "$srcdir/lib/c-auto.h.in" *************** *** 933,938 **** EOF ! err=`eval "($CPP conftest.c >/dev/null) 2>&1"` ! if test -z "$err"; then rm -rf conftest* X10WIN=t --- 1302,1309 ---- EOF ! # Some shells (Coherent) do redirections in the wrong order, so need ! # the parens. ! ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"` ! if test -z "$ac_err"; then rm -rf conftest* X10WIN=t *************** *** 948,974 **** # If we find X, set shell vars x_includes and x_libraries to the paths. no_x=true ! echo checking for X include and library files with xmkmf rm -fr conftestdir if mkdir conftestdir; then cd conftestdir ! cat > Imakefile <<\EOF acfindx: ! @echo "im_incroot=$(INCROOT); im_usrlibdir=$(USRLIBDIR); im_libdir=$(LIBDIR)" EOF if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then no_x= # GNU make sometimes prints "make[1]: Entering...", which would confuse us. ! eval `make acfindx | grep -v make` # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. ! if test ! -f $im_usrlibdir/libX11.a && test -f $im_libdir/libX11.a; then ! im_usrlibdir=$im_libdir fi ! case "$im_incroot" in /usr/include) ;; ! *) x_includes="$im_incroot" ;; esac ! case "$im_usrlibdir" in /usr/lib | /lib) ;; ! *) x_libraries="$im_usrlibdir" ;; esac fi --- 1319,1348 ---- # If we find X, set shell vars x_includes and x_libraries to the paths. no_x=true ! if test "x$with_x" != xno; then ! test -n "$silent" || echo "checking for X include and library files with xmkmf" rm -fr conftestdir if mkdir conftestdir; then cd conftestdir ! # Make sure to not put "make" in the Imakefile rules, since we grep it out. ! cat > Imakefile <<'EOF' acfindx: ! @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' EOF if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then no_x= # GNU make sometimes prints "make[1]: Entering...", which would confuse us. ! eval `make acfindx 2>/dev/null | grep -v make` # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. ! if test ! -f $ac_im_usrlibdir/libX11.a && test -f $ac_im_libdir/libX11.a ! then ! ac_im_usrlibdir=$ac_im_libdir fi ! case "$ac_im_incroot" in /usr/include) ;; ! *) test -z "$x_includes" && x_includes="$ac_im_incroot" ;; esac ! case "$ac_im_usrlibdir" in /usr/lib | /lib) ;; ! *) test -z "$x_libraries" && x_libraries="$ac_im_usrlibdir" ;; esac fi *************** *** 977,988 **** fi ! if test -z "$im_usrlibdir"; then ! echo checking for X include and library files directly ! cat > conftest.c <<EOF ! #include "confdefs.h" ! #include <X11/Intrinsic.h> ! EOF ! err=`eval "($CPP conftest.c >/dev/null) 2>&1"` ! if test -z "$err"; then rm -rf conftest* no_x= --- 1351,1370 ---- fi ! if test -z "$ac_im_usrlibdir"; then ! test -n "$silent" || echo "checking for X include and library files directly" ! if test ".$x_direct_test_library" = . ; then ! x_direct_test_library='Xt' ! fi ! if test ".$x_direct_test_include" = . ; then ! x_direct_test_include='X11/Intrinsic.h' ! fi ! cat > conftest.${ac_ext} <<EOF ! #include "confdefs.h" ! #include <$x_direct_test_include> ! EOF ! # Some shells (Coherent) do redirections in the wrong order, so need ! # the parens. ! ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"` ! if test -z "$ac_err"; then rm -rf conftest* no_x= *************** *** 990,1009 **** else rm -rf conftest* ! for dir in \ ! /usr/local/include \ ! /usr/unsupported/include \ ! /usr/x386/include \ ! /usr/local/x11r5/include \ ! /usr/include/X11R5 \ ! /usr/include/X11R4 \ ! /usr/X11R5/include \ ! /usr/X11/include \ ! /usr/openwin/include \ /usr/openwin/share/include \ - /usr/lpp/Xamples/include \ ; \ do ! if test -r $dir/X11/Intrinsic.h; then ! x_includes=$dir; no_x= break fi --- 1372,1415 ---- else rm -rf conftest* ! for ac_dir in \ ! /usr/X11R6/include \ ! /usr/X11R5/include \ ! /usr/X11R4/include \ ! \ ! /usr/include/X11R6 \ ! /usr/include/X11R5 \ ! /usr/include/X11R4 \ ! \ ! /usr/local/X11R6/include \ ! /usr/local/X11R5/include \ ! /usr/local/X11R4/include \ ! \ ! /usr/local/include/X11R6 \ ! /usr/local/include/X11R5 \ ! /usr/local/include/X11R4 \ ! \ ! /usr/X11/include \ ! /usr/include/X11 \ ! /usr/local/X11/include \ ! /usr/local/include/X11 \ ! \ ! /usr/X386/include \ ! /usr/x386/include \ ! /usr/XFree86/include/X11 \ ! \ ! /usr/include \ ! /usr/local/include \ ! /usr/unsupported/include \ ! /usr/athena/include \ ! /usr/local/x11r5/include \ ! /usr/lpp/Xamples/include \ ! \ ! /usr/openwin/include \ /usr/openwin/share/include \ ; \ do ! if test -r "$ac_dir/$x_direct_test_include"; then ! test -z "$x_includes" && x_includes=$ac_dir ! no_x= break fi *************** *** 1014,1053 **** # Check for the libraries. First see if replacing the `include' by # `lib' works. ! LIBS_save="${LIBS}" ! LIBS="${LIBS} -lXt" ! have_lib="" ! echo checking for -lXt ! cat > conftest.c <<EOF #include "confdefs.h" ! int main() { exit(0); } ! int t() { main(); } EOF ! if eval $compile; then rm -rf conftest* ! have_lib="1" fi rm -f conftest* ! LIBS="${LIBS_save}" ! if test -n "${have_lib}"; then :; no_x= else ! :; for dir in `echo "$x_includes" | sed s/include/lib/` \ ! /usr/local/lib \ ! /usr/unsupported/lib \ ! /usr/x386/lib \ ! /usr/local/x11r5/lib \ ! /usr/lib/X11 \ ! /usr/lib/X11R4 \ ! /usr/X11R5/lib \ ! /usr/X11/lib \ ! /usr/openwin/lib \ ! /usr/lpp/Xamples/lib \ ! ; \ do ! for extension in a so sl; do ! if test -r $dir/libXt.$extension; then ! x_libraries=$dir; no_x= break 2 fi --- 1420,1484 ---- # Check for the libraries. First see if replacing the `include' by # `lib' works. ! ac_save_LIBS="${LIBS}" ! LIBS="${LIBS} -l"$x_direct_test_library"" ! ac_have_lib="" ! test -n "$silent" || echo "checking for -l"$x_direct_test_library"" ! cat > conftest.${ac_ext} <<EOF #include "confdefs.h" ! int main() { return 0; } ! int t() { main();; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* ! ac_have_lib="1" fi rm -f conftest* ! LIBS="${ac_save_LIBS}" ! if test -n "${ac_have_lib}"; then :; no_x= else ! :; for ac_dir in `echo "$x_includes" | sed s/include/lib/` \ ! /usr/X11R6/lib \ ! /usr/X11R5/lib \ ! /usr/X11R4/lib \ ! \ ! /usr/lib/X11R6 \ ! /usr/lib/X11R5 \ ! /usr/lib/X11R4 \ ! \ ! /usr/local/X11R6/lib \ ! /usr/local/X11R5/lib \ ! /usr/local/X11R4/lib \ ! \ ! /usr/local/lib/X11R6 \ ! /usr/local/lib/X11R5 \ ! /usr/local/lib/X11R4 \ ! \ ! /usr/X11/lib \ ! /usr/lib/X11 \ ! /usr/local/X11/lib \ ! /usr/local/lib/X11 \ ! \ ! /usr/X386/lib \ ! /usr/x386/lib \ ! /usr/XFree86/lib/X11 \ ! \ ! /usr/lib \ ! /usr/local/lib \ ! /usr/unsupported/lib \ ! /usr/athena/lib \ ! /usr/local/x11r5/lib \ ! /usr/lpp/Xamples/lib \ ! \ ! /usr/openwin/lib \ ! /usr/openwin/share/lib \ ! ; \ do ! for ac_extension in a so sl; do ! if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then ! test -z "$x_libraries" && x_libraries=$ac_dir ! no_x= break 2 fi *************** *** 1057,1141 **** fi ! if test -n "$verbose"; then ! test -n "$x_includes" && echo " found X11 headers in $x_includes" ! test -n "$x_libraries" && echo " found X11 libraries in $x_libraries" fi if test -n "$x_includes"; then ! x_include_flags=-I$x_includes elif test -n "$no_x"; then # Not all programs may use this symbol, but it won't hurt to define it. ! x_include_flags=-DX_DISPLAY_MISSING fi ! # ! # It would be nice to have a more robust check for the -R ld option then # just checking for Solaris. - # # It would also be nice to do this for all -L options, not just this one. if test -n "$x_libraries"; then ! x_lib_flags=-L$x_libraries ! if test "`uname 2>/dev/null`" = SunOS \ && uname -r | grep '^5' >/dev/null; then ! x_lib_flags="$x_lib_flags -R$x_libraries" fi fi ! # ! # Check for additional X libraries. ! # ! # Since we already have an explicit check for POSIXified ISC, assume ! # it's been used. if test -n "$ISC"; then ! x_extra_libs="$x_extra_libs -lnsl_s -linet" ! test -n "$verbose" && echo " adding -lnsl_s -linet to x_extra_libs (for ISC)" else # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X # libraries were built with DECnet support. And karl@cs.umb.edu's Alpha ! # needs dnet_stub. ! LIBS_save="${LIBS}" LIBS="${LIBS} -ldnet" ! have_lib="" ! echo checking for -ldnet ! cat > conftest.c <<EOF #include "confdefs.h" ! int main() { exit(0); } ! int t() { main(); } EOF ! if eval $compile; then rm -rf conftest* ! have_lib="1" fi rm -f conftest* ! LIBS="${LIBS_save}" ! if test -n "${have_lib}"; then ! :; x_extra_libs="$x_extra_libs -ldnet" ! have_dnet=t ! test -n "$verbose" && echo " adding -ldnet to x_extra_libs" else :; fi ! if test -z "$have_dnet"; then ! LIBS_save="${LIBS}" LIBS="${LIBS} -ldnet_stub" ! have_lib="" ! echo checking for -ldnet_stub ! cat > conftest.c <<EOF #include "confdefs.h" ! int main() { exit(0); } ! int t() { main(); } EOF ! if eval $compile; then rm -rf conftest* ! have_lib="1" fi rm -f conftest* ! LIBS="${LIBS_save}" ! if test -n "${have_lib}"; then ! :; x_extra_libs="$x_extra_libs -ldnet_stub" ! test -n "$verbose" && echo " adding -ldnet_stub to x_extra_libs" else :; --- 1488,1566 ---- fi ! test -n "$x_includes" && test -n "$verbose" && echo " X11 headers are in $x_includes" ! test -n "$x_libraries" && test -n "$verbose" && echo " X11 libraries are in $x_libraries" fi + + test -n "$silent" || echo "checking for additional X libraries and flags" if test -n "$x_includes"; then ! X_CFLAGS="$X_CFLAGS -I$x_includes" elif test -n "$no_x"; then # Not all programs may use this symbol, but it won't hurt to define it. ! X_CFLAGS="$X_CFLAGS -DX_DISPLAY_MISSING" fi ! ! # It would be nice to have a more robust check for the -R ld option than # just checking for Solaris. # It would also be nice to do this for all -L options, not just this one. if test -n "$x_libraries"; then ! X_LIBS="$X_LIBS -L$x_libraries" ! if test "`(uname) 2>/dev/null`" = SunOS \ && uname -r | grep '^5' >/dev/null; then ! X_LIBS="$X_LIBS -R$x_libraries" fi fi ! ! # Check for system-dependent libraries X programs must link with. if test -n "$ISC"; then ! X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" else # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X # libraries were built with DECnet support. And karl@cs.umb.edu's Alpha ! # needs dnet_stub (dnet doesn't exist). ! ac_save_LIBS="${LIBS}" LIBS="${LIBS} -ldnet" ! ac_have_lib="" ! test -n "$silent" || echo "checking for -ldnet" ! cat > conftest.${ac_ext} <<EOF #include "confdefs.h" ! int main() { return 0; } ! int t() { main();; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* ! ac_have_lib="1" fi rm -f conftest* ! LIBS="${ac_save_LIBS}" ! if test -n "${ac_have_lib}"; then ! :; X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" ! ac_have_dnet=t else :; fi ! if test -z "$ac_have_dnet"; then ! ac_save_LIBS="${LIBS}" LIBS="${LIBS} -ldnet_stub" ! ac_have_lib="" ! test -n "$silent" || echo "checking for -ldnet_stub" ! cat > conftest.${ac_ext} <<EOF #include "confdefs.h" ! int main() { return 0; } ! int t() { main();; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* ! ac_have_lib="1" fi rm -f conftest* ! LIBS="${ac_save_LIBS}" ! if test -n "${ac_have_lib}"; then ! :; X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" else :; *************** *** 1143,1195 **** fi ! # lieder@skyler.mavd.honeywell.com says without -lsocket, ! # socket/setsockopt and other routines are undefined under SCO ODT 2.0. ! LIBS_save="${LIBS}" ! LIBS="${LIBS} -lsocket" ! have_lib="" ! echo checking for -lsocket ! cat > conftest.c <<EOF #include "confdefs.h" ! int main() { exit(0); } ! int t() { main(); } EOF ! if eval $compile; then rm -rf conftest* ! have_lib="1" fi rm -f conftest* ! LIBS="${LIBS_save}" ! if test -n "${have_lib}"; then ! :; x_extra_libs="$x_extra_libs -lsocket" ! test -n "$verbose" && echo " adding -lsocket to x_extra_libs" else :; fi ! fi ! # ! ! if test -z "$Xextlib"; then ! LIBS_save="${LIBS}" ! LIBS="${LIBS} -lXext" ! have_lib="" ! echo checking for -lXext ! cat > conftest.c <<EOF #include "confdefs.h" ! int main() { exit(0); } ! int t() { main(); } EOF ! if eval $compile; then rm -rf conftest* ! have_lib="1" fi rm -f conftest* ! LIBS="${LIBS_save}" ! if test -n "${have_lib}"; then ! :; Xextlib=-lXext else :; --- 1568,1622 ---- fi ! # ! # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT. ! # Not sure which flavor of 386 Unix this is, but it seems harmless to ! # check for it. ! ac_save_LIBS="${LIBS}" ! LIBS="${LIBS} -lnsl" ! ac_have_lib="" ! test -n "$silent" || echo "checking for -lnsl" ! cat > conftest.${ac_ext} <<EOF #include "confdefs.h" ! int main() { return 0; } ! int t() { main();; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* ! ac_have_lib="1" fi rm -f conftest* ! LIBS="${ac_save_LIBS}" ! if test -n "${ac_have_lib}"; then ! :; X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" else :; fi ! # ! # lieder@skyler.mavd.honeywell.com says without -lsocket, ! # socket/setsockopt and other routines are undefined under SCO ODT 2.0. ! # But -lsocket is broken on IRIX, according to simon@lia.di.epfl.ch. ! if test "`(uname) 2>/dev/null`" != IRIX; then ! ac_save_LIBS="${LIBS}" ! LIBS="${LIBS} -lsocket" ! ac_have_lib="" ! test -n "$silent" || echo "checking for -lsocket" ! cat > conftest.${ac_ext} <<EOF #include "confdefs.h" ! int main() { return 0; } ! int t() { main();; return 0; } EOF ! if eval $ac_compile; then rm -rf conftest* ! ac_have_lib="1" fi rm -f conftest* ! LIBS="${ac_save_LIBS}" ! if test -n "${ac_have_lib}"; then ! :; X_EXTRA_LIBS="$X_EXTRA_LIBS -lsocket" else :; *************** *** 1197,1201 **** fi ! wlibs="-lXt $Xextlib -lX11 $wlibs" (cd $srcdir/mf/MFwindow; rm -f x11.c; $LN_S x11-Xt.c x11.c) fi --- 1624,1670 ---- fi ! fi ! ! # Check for libraries that X11R6 Xt/Xaw programs need. ! save_ldflags=$LDFLAGS ! LDFLAGS="$LDFLAGS -L$x_libraries" ! # Unfortunately, SM needs ICE to (dynamically) link under SunOS 4.x (so ! # we have to check for ICE first), but we must link in the order -lSM ! # -lICE or we get undefined symbols. Resolution is just to assume we ! # have SM if we have ICE. Why not? Furthermore, these have to be ! # linked with before -lX11, in contrast to the other libraries we check ! # for below, so use a different variable. ! # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. ! ac_save_LIBS="${LIBS}" ! LIBS="${LIBS} -lICE $X_EXTRA_LIBS" ! ac_have_lib="" ! test -n "$silent" || echo "checking for -lICE $X_EXTRA_LIBS" ! cat > conftest.${ac_ext} <<EOF ! #include "confdefs.h" ! ! int main() { return 0; } ! int t() { main();; return 0; } ! EOF ! if eval $ac_compile; then ! rm -rf conftest* ! ac_have_lib="1" ! ! fi ! rm -f conftest* ! LIBS="${ac_save_LIBS}" ! if test -n "${ac_have_lib}"; then ! :; X_R6_LIBS="-lSM -lICE" ! else ! :; ! fi ! ! LDFLAGS=$save_ldflags ! # ! test -n "$verbose" && echo " X compiler flags: $X_CFLAGS" ! test -n "$verbose" && echo " X library flags: $X_LIBS" ! test -n "$verbose" && echo " R6 libraries: $X_R6_LIBS" ! test -n "$verbose" && echo " extra X libraries: $X_EXTRA_LIBS" ! ! wlibs="-lXt $X_R6_LIBS -lX11 $wlibs" (cd $srcdir/mf/MFwindow; rm -f x11.c; $LN_S x11-Xt.c x11.c) fi *************** *** 1213,1217 **** # If `small' version is not wanted, do nothing -- make will copy the # default change file. ! cat > conftest.c <<EOF #include "confdefs.h" #include "$srcdir/lib/c-auto.h.in" --- 1682,1686 ---- # If `small' version is not wanted, do nothing -- make will copy the # default change file. ! cat > conftest.${ac_ext} <<EOF #include "confdefs.h" #include "$srcdir/lib/c-auto.h.in" *************** *** 1221,1226 **** EOF ! err=`eval "($CPP conftest.c >/dev/null) 2>&1"` ! if test -z "$err"; then rm -rf conftest* SMALLTeX=t --- 1690,1697 ---- EOF ! # Some shells (Coherent) do redirections in the wrong order, so need ! # the parens. ! ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"` ! if test -z "$ac_err"; then rm -rf conftest* SMALLTeX=t *************** *** 1235,1244 **** { test -n "$verbose" && \ ! echo " defining" GLUERATIO_TYPE to be float ! echo "#define" GLUERATIO_TYPE float >> confdefs.h DEFS="$DEFS -DGLUERATIO_TYPE=float" ! SEDDEFS="${SEDDEFS}\${SEDdA}GLUERATIO_TYPE\${SEDdB}GLUERATIO_TYPE\${SEDdC}float\${SEDdD} ! \${SEDuA}GLUERATIO_TYPE\${SEDuB}GLUERATIO_TYPE\${SEDuC}float\${SEDuD} ! \${SEDeA}GLUERATIO_TYPE\${SEDeB}GLUERATIO_TYPE\${SEDeC}float\${SEDeD} " } --- 1706,1715 ---- { test -n "$verbose" && \ ! echo " defining" GLUERATIO_TYPE to be "float" ! echo "#define" GLUERATIO_TYPE "float" >> confdefs.h DEFS="$DEFS -DGLUERATIO_TYPE=float" ! ac_sed_defs="${ac_sed_defs}\${ac_dA}GLUERATIO_TYPE\${ac_dB}GLUERATIO_TYPE\${ac_dC}float\${ac_dD} ! \${ac_uA}GLUERATIO_TYPE\${ac_uB}GLUERATIO_TYPE\${ac_uC}float\${ac_uD} ! \${ac_eA}GLUERATIO_TYPE\${ac_eB}GLUERATIO_TYPE\${ac_eC}float\${ac_eD} " } *************** *** 1247,1251 **** # Metafont next. ! cat > conftest.c <<EOF #include "confdefs.h" #include "$srcdir/lib/c-auto.h.in" --- 1718,1722 ---- # Metafont next. ! cat > conftest.${ac_ext} <<EOF #include "confdefs.h" #include "$srcdir/lib/c-auto.h.in" *************** *** 1255,1260 **** EOF ! err=`eval "($CPP conftest.c >/dev/null) 2>&1"` ! if test -z "$err"; then rm -rf conftest* SMALLMF=t --- 1726,1733 ---- EOF ! # Some shells (Coherent) do redirections in the wrong order, so need ! # the parens. ! ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"` ! if test -z "$ac_err"; then rm -rf conftest* SMALLMF=t *************** *** 1269,1273 **** # And finally BibTeX. ! cat > conftest.c <<EOF #include "confdefs.h" #include "$srcdir/lib/c-auto.h.in" --- 1742,1746 ---- # And finally BibTeX. ! cat > conftest.${ac_ext} <<EOF #include "confdefs.h" #include "$srcdir/lib/c-auto.h.in" *************** *** 1277,1282 **** EOF ! err=`eval "($CPP conftest.c >/dev/null) 2>&1"` ! if test -z "$err"; then rm -rf conftest* SMALLBibTeX=t --- 1750,1757 ---- EOF ! # Some shells (Coherent) do redirections in the wrong order, so need ! # the parens. ! ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"` ! if test -z "$ac_err"; then rm -rf conftest* SMALLBibTeX=t *************** *** 1291,1313 **** fi ! # Set default prefixes. if test -n "$prefix"; then ! test -z "$exec_prefix" && exec_prefix='${prefix}' ! prsub="s%^prefix\$[ ]*\$=\$[ ]*\$.*$%prefix\\1=\\2$prefix%" fi if test -n "$exec_prefix"; then ! prsub="$prsub s%^exec_prefix\$[ ]*\$=\$[ ]*\$.*$%exec_prefix\\1=\\2$exec_prefix%" fi # Quote sed substitution magic chars in DEFS. cat >conftest.def <<EOF $DEFS EOF ! escape_ampersand_and_backslash='s%[&\\]%\\&%g' ! DEFS=`sed "$escape_ampersand_and_backslash" <conftest.def` rm -f conftest.def # Substitute for predefined variables. ! trap 'rm -f config.status; exit 1' 1 3 15 echo creating config.status rm -f config.status --- 1766,1800 ---- fi ! ! # The preferred way to propogate these variables is regular @ substitutions. if test -n "$prefix"; then ! ac_prsub="s%^prefix\$[ ]*\$=\$[ ]*\$.*$%prefix\\1=\\2$prefix%" ! else ! prefix=/usr/local fi if test -n "$exec_prefix"; then ! ac_prsub="$ac_prsub s%^exec_prefix\$[ ]*\$=\$[ ]*\$.*$%exec_prefix\\1=\\2$exec_prefix%" + else + exec_prefix='${prefix}' # Let make expand it. fi + + # Any assignment to VPATH causes Sun make to only execute + # the first set of double-colon rules, so remove it if not needed. + # If there is a colon in the path, we need to keep it. + if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' + fi + # Quote sed substitution magic chars in DEFS. cat >conftest.def <<EOF $DEFS EOF ! ac_escape_ampersand_and_backslash='s%[&\\]%\\&%g' ! DEFS=`sed "$ac_escape_ampersand_and_backslash" <conftest.def` rm -f conftest.def # Substitute for predefined variables. ! trap 'rm -f config.status; exit 1' 1 2 15 echo creating config.status rm -f config.status *************** *** 1321,1331 **** # $0 $configure_args ! for arg do ! case "\$arg" in ! -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ! echo running \${CONFIG_SHELL-/bin/sh} $0 $configure_args ! exec \${CONFIG_SHELL-/bin/sh} $0 $configure_args ;; ! *) echo "Usage: config.status --recheck" 2>&1; exit 1 ;; esac done --- 1808,1824 ---- # $0 $configure_args ! ac_cs_usage="Usage: config.status [--recheck] [--version] [--help]" ! for ac_option do ! case "\$ac_option" in ! -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ! echo running \${CONFIG_SHELL-/bin/sh} $0 $configure_args --no-create ! exec \${CONFIG_SHELL-/bin/sh} $0 $configure_args --no-create ;; ! -version | --version | --versio | --versi | --vers | --ver | --ve | --v) ! echo "config.status generated by autoconf version 1.11" ! exit 0 ;; ! -help | --help | --hel | --he | --h) ! echo "\$ac_cs_usage"; exit 0 ;; ! *) echo "\$ac_cs_usage"; exit 1 ;; esac done *************** *** 1333,1337 **** trap 'rm -fr Makefile bibtex/Makefile dviutil/Makefile fontutil/Makefile \ lib/Makefile man/Makefile mf/Makefile mf/MFwindow/Makefile \ ! tex/Makefile web/Makefile web2c/Makefile lib/c-auto.h conftest*; exit 1' 1 3 15 CC='$CC' CPP='$CPP' --- 1826,1830 ---- trap 'rm -fr Makefile bibtex/Makefile dviutil/Makefile fontutil/Makefile \ lib/Makefile man/Makefile mf/Makefile mf/MFwindow/Makefile \ ! tex/Makefile web/Makefile web2c/Makefile lib/c-auto.h conftest*; exit 1' 1 2 15 CC='$CC' CPP='$CPP' *************** *** 1345,1379 **** LN_S='$LN_S' LEX_OUTPUT_ROOT='$LEX_OUTPUT_ROOT' ! x_include_flags='$x_include_flags' ! x_lib_flags='$x_lib_flags' ! x_extra_libs='$x_extra_libs' wlibs='$wlibs' LIBS='$LIBS' srcdir='$srcdir' prefix='$prefix' exec_prefix='$exec_prefix' ! prsub='$prsub' extrasub='$extrasub' EOF cat >> config.status <<\EOF ! top_srcdir=$srcdir CONFIG_FILES=${CONFIG_FILES-"Makefile bibtex/Makefile dviutil/Makefile fontutil/Makefile \ lib/Makefile man/Makefile mf/Makefile mf/MFwindow/Makefile \ tex/Makefile web/Makefile web2c/Makefile"} ! for file in .. ${CONFIG_FILES}; do if test "x$file" != x..; then ! srcdir=$top_srcdir # Remove last slash and all that follows it. Not all systems have dirname. ! dir=`echo $file|sed 's%/[^/][^/]*$%%'` ! if test "$dir" != "$file"; then ! test "$top_srcdir" != . && srcdir=$top_srcdir/$dir ! test ! -d $dir && mkdir $dir fi ! echo creating $file ! rm -f $file ! echo "# Generated automatically from `echo $file|sed 's|.*/||'`.in by configure." > $file ! sed -e " ! $prsub $extrasub s%@CC@%$CC%g --- 1838,1918 ---- LN_S='$LN_S' LEX_OUTPUT_ROOT='$LEX_OUTPUT_ROOT' ! X_CFLAGS='$X_CFLAGS' ! X_LIBS='$X_LIBS' ! X_R6_LIBS='$X_R6_LIBS' ! X_EXTRA_LIBS='$X_EXTRA_LIBS' wlibs='$wlibs' LIBS='$LIBS' srcdir='$srcdir' + top_srcdir='$top_srcdir' prefix='$prefix' exec_prefix='$exec_prefix' ! ac_prsub='$ac_prsub' ! ac_vpsub='$ac_vpsub' extrasub='$extrasub' EOF cat >> config.status <<\EOF ! ac_given_srcdir=$srcdir CONFIG_FILES=${CONFIG_FILES-"Makefile bibtex/Makefile dviutil/Makefile fontutil/Makefile \ lib/Makefile man/Makefile mf/Makefile mf/MFwindow/Makefile \ tex/Makefile web/Makefile web2c/Makefile"} ! for ac_file in .. ${CONFIG_FILES}; do if test "x$ac_file" != x..; then # Remove last slash and all that follows it. Not all systems have dirname. ! ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` ! if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then ! # The file is in a subdirectory. ! test ! -d "$ac_dir" && mkdir "$ac_dir" ! ac_dir_suffix="/$ac_dir" ! else ! ac_dir_suffix= fi ! ! # A "../" for each directory in $ac_dir_suffix. ! ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` ! case "$ac_given_srcdir" in ! .) srcdir=. ! if test -z "$ac_dir_suffix"; then top_srcdir=. ! else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; ! /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; ! *) # Relative path. ! srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" ! top_srcdir="$ac_dots$ac_given_srcdir" ;; ! esac ! ! echo creating "$ac_file" ! rm -f "$ac_file" ! comment_str="Generated automatically from `echo $ac_file|sed 's|.*/||'`.in by configure." ! case "$ac_file" in ! *.c | *.h | *.C | *.cc | *.m ) echo "/* $comment_str */" > "$ac_file" ;; ! * ) echo "# $comment_str" > "$ac_file" ;; ! esac ! # Replace lines of the form ac_include foo with the contents of foo: ! # first, from the ac_include lines construct a list of sed ! # commands to remove them, and include the files; then run sed. ! # Have to use sed because old (Ultrix, SunOS) awk does not support ! # getline or system. (Anyway, configure scripts aren't supposed to use awk.) ! # Use \@...@<cmd> form of sed address because the filename may contain /. ! # Can't use only one -e and commands {dr foo} because foo has to be last. ! # Use @e initially instead of -e because GNU echo has a -e option. ! file_substs=`sed -n \ ! "/^ac_include/s%ac_include[ ]*$.*$%@e '\\\\\@^&@r \1' -e '\\\\\@^&@d'%p"\ ! $ac_given_srcdir/${ac_file}.in` ! if test -n "$file_substs"; then ! # Change @e back to -e. ! file_subst_cmd="sed `echo $file_substs | sed s/@e/-e/g`" ! else ! # If no substitutions and hence no sed commands, don't choke. ! file_subst_cmd=cat ! fi ! # cd into the srcdir because the files being included more or less ! # must be part of the distribution. I can't find any way to do ! # variable substitution in the sed commands (so the user could have, ! # e.g., $top_srcdir in their ac_include line). ! (cd $ac_given_srcdir && eval $file_subst_cmd ${ac_file}.in) \ ! | sed -e " ! $ac_prsub ! $ac_vpsub $extrasub s%@CC@%$CC%g *************** *** 1388,1425 **** s%@LN_S@%$LN_S%g s%@LEX_OUTPUT_ROOT@%$LEX_OUTPUT_ROOT%g ! s%@x_include_flags@%$x_include_flags%g ! s%@x_lib_flags@%$x_lib_flags%g ! s%@x_extra_libs@%$x_extra_libs%g s%@wlibs@%$wlibs%g s%@LIBS@%$LIBS%g s%@srcdir@%$srcdir%g ! s%@DEFS@%-DHAVE_CONFIG_H%" $top_srcdir/${file}.in >> $file fi; done ! CONFIG_HEADERS=${CONFIG_HEADERS-"lib/c-auto.h"} ! for file in .. ${CONFIG_HEADERS}; do if test "x$file" != x..; then ! echo creating $file ! ! # These sed commands are put into SEDDEFS when defining a macro. # They are broken into pieces to make the sed script easier to manage. # They are passed to sed as "A NAME B NAME C VALUE D", where NAME # is the cpp macro being defined and VALUE is the value it is being given. # Each defining turns into a single global substitution command. # ! # SEDd sets the value in "#define NAME VALUE" lines. ! SEDdA='s@^$[ ]*$#$[ ]*define[ ][ ]*$' ! SEDdB='$[ ][ ]*$[^ ]*@\1#\2' ! SEDdC='\3' ! SEDdD='@g' ! # SEDu turns "#undef NAME" with trailing blanks into "#define NAME VALUE". ! SEDuA='s@^$[ ]*$#$[ ]*$undef$[ ][ ]*$' ! SEDuB='$[ ]$@\1#\2define\3' ! SEDuC=' ' ! SEDuD='\4@g' ! # SEDe turns "#undef NAME" without trailing blanks into "#define NAME VALUE". ! SEDeA='s@^$[ ]*$#$[ ]*$undef$[ ][ ]*$' ! SEDeB='$@\1#\2define\3' ! SEDeC=' ' ! SEDeD='@g' rm -f conftest.sed EOF --- 1927,1966 ---- s%@LN_S@%$LN_S%g s%@LEX_OUTPUT_ROOT@%$LEX_OUTPUT_ROOT%g ! s%@X_CFLAGS@%$X_CFLAGS%g ! s%@X_LIBS@%$X_LIBS%g ! s%@X_R6_LIBS@%$X_R6_LIBS%g ! s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g s%@wlibs@%$wlibs%g s%@LIBS@%$LIBS%g s%@srcdir@%$srcdir%g ! s%@top_srcdir@%$top_srcdir%g ! s%@prefix@%$prefix%g ! s%@exec_prefix@%$exec_prefix%g ! s%@DEFS@%-DHAVE_CONFIG_H%" >> $ac_file fi; done ! # These sed commands are put into ac_sed_defs when defining a macro. # They are broken into pieces to make the sed script easier to manage. # They are passed to sed as "A NAME B NAME C VALUE D", where NAME # is the cpp macro being defined and VALUE is the value it is being given. # Each defining turns into a single global substitution command. + # Hopefully no one uses "!" as a variable value. + # Other candidates for the sed separators, like , and @, do get used. # ! # ac_d sets the value in "#define NAME VALUE" lines. ! ac_dA='s!^$[ ]*$#$[ ]*define[ ][ ]*$' ! ac_dB='$[ ][ ]*$[^ ]*!\1#\2' ! ac_dC='\3' ! ac_dD='!g' ! # ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE". ! ac_uA='s!^$[ ]*$#$[ ]*$undef$[ ][ ]*$' ! ac_uB='$[ ]$!\1#\2define\3' ! ac_uC=' ' ! ac_uD='\4!g' ! # ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE". ! ac_eA='s!^$[ ]*$#$[ ]*$undef$[ ][ ]*$' ! ac_eB='$!\1#\2define\3' ! ac_eC=' ' ! ac_eD='!g' rm -f conftest.sed EOF *************** *** 1427,1447 **** rm -f conftest.sh cat > conftest.sh <<EOF ! $SEDDEFS EOF ! # Break up $SEDDEFS (now in conftest.sh) because some shells have a limit # on the size of here documents. # Maximum number of lines to put in a single here document. ! maxshlines=9 while : do ! # wc gives bogus results for an empty file on some systems. ! lines=`grep -c . conftest.sh` ! if test -z "$lines" || test "$lines" -eq 0; then break; fi rm -f conftest.s1 conftest.s2 ! sed ${maxshlines}q conftest.sh > conftest.s1 # Like head -20. ! sed 1,${maxshlines}d conftest.sh > conftest.s2 # Like tail +21. # Write a limited-size here document to append to conftest.sed. echo 'cat >> conftest.sed <<CONFEOF' >> config.status --- 1968,1988 ---- rm -f conftest.sh cat > conftest.sh <<EOF ! $ac_sed_defs EOF ! # Break up $ac_sed_defs (now in conftest.sh) because some shells have a limit # on the size of here documents. # Maximum number of lines to put in a single here document. ! ac_max_sh_lines=9 while : do ! # wc gives bogus results for an empty file on some AIX systems. ! ac_lines=`grep -c . conftest.sh` ! if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi rm -f conftest.s1 conftest.s2 ! sed ${ac_max_sh_lines}q conftest.sh > conftest.s1 # Like head -9. ! sed 1,${ac_max_sh_lines}d conftest.sh > conftest.s2 # Like tail +10. # Write a limited-size here document to append to conftest.sed. echo 'cat >> conftest.sed <<CONFEOF' >> config.status *************** *** 1464,1494 **** rm -f conftest.h # Break up the sed commands because old seds have small limits. ! maxsedlines=20 ! cp $top_srcdir/$file.in conftest.h1 ! while : ! do ! lines=`grep -c . conftest.sed` ! if test -z "$lines" || test "$lines" -eq 0; then break; fi ! rm -f conftest.s1 conftest.s2 conftest.h2 ! sed ${maxsedlines}q conftest.sed > conftest.s1 # Like head -20. ! sed 1,${maxsedlines}d conftest.sed > conftest.s2 # Like tail +21. ! sed -f conftest.s1 < conftest.h1 > conftest.h2 ! rm -f conftest.s1 conftest.h1 conftest.sed ! mv conftest.h2 conftest.h1 ! mv conftest.s2 conftest.sed ! done ! rm -f conftest.sed conftest.h ! echo "/* $file. Generated automatically by configure. */" > conftest.h ! cat conftest.h1 >> conftest.h ! rm -f conftest.h1 ! if cmp -s $file conftest.h 2>/dev/null; then ! # The file exists and we would not be changing it. ! echo "$file is unchanged" ! rm -f conftest.h ! else ! rm -f $file ! mv conftest.h $file ! fi fi; done --- 2005,2042 ---- rm -f conftest.h # Break up the sed commands because old seds have small limits. ! ac_max_sed_lines=20 ! ! CONFIG_HEADERS=${CONFIG_HEADERS-"lib/c-auto.h"} ! for ac_file in .. ${CONFIG_HEADERS}; do if test "x$ac_file" != x..; then ! echo creating $ac_file ! ! cp $ac_given_srcdir/$ac_file.in conftest.h1 ! cp conftest.sed conftest.stm ! while : ! do ! ac_lines=`grep -c . conftest.stm` ! if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi ! rm -f conftest.s1 conftest.s2 conftest.h2 ! sed ${ac_max_sed_lines}q conftest.stm > conftest.s1 # Like head -20. ! sed 1,${ac_max_sed_lines}d conftest.stm > conftest.s2 # Like tail +21. ! sed -f conftest.s1 < conftest.h1 > conftest.h2 ! rm -f conftest.s1 conftest.h1 conftest.stm ! mv conftest.h2 conftest.h1 ! mv conftest.s2 conftest.stm ! done ! rm -f conftest.stm conftest.h ! echo "/* $ac_file. Generated automatically by configure. */" > conftest.h ! cat conftest.h1 >> conftest.h ! rm -f conftest.h1 ! if cmp -s $ac_file conftest.h 2>/dev/null; then ! # The file exists and we would not be changing it. ! echo "$ac_file is unchanged" ! rm -f conftest.h ! else ! rm -f $ac_file ! mv conftest.h $ac_file ! fi fi; done + rm -f conftest.sed *************** *** 1497,1500 **** EOF chmod +x config.status ! ${CONFIG_SHELL-/bin/sh} config.status --- 2045,2049 ---- EOF chmod +x config.status ! # Some shells look in PATH for config.status without the "./". ! test -n "$no_create" || ${CONFIG_SHELL-/bin/sh} ./config.status --- end of replacement patch --- *** web2c/lib/c-auto.h.in.save Tue Feb 1 12:28:36 1994 --- web2c/lib/c-auto.h.in Fri Sep 23 18:28:15 1994 *************** *** 152,156 **** /* Define as the proper declaration for yytext. */ ! #undef DECLARE_YYTEXT /* Define if you have dirent.h. */ --- 152,161 ---- /* Define as the proper declaration for yytext. */ ! #undef YYTEXT_POINTER ! #if YYTEXT_POINTER ! #define DECLARE_YYTEXT extern char *yytext; ! #else ! #define DECLARE_YYTEXT extern char yytext[]; ! #endif /* Define if you have dirent.h. */ *** web2c/lib/main.c.save Tue May 25 11:41:19 1993 --- web2c/lib/main.c Fri Sep 23 15:48:40 1994 *************** *** 28,31 **** --- 28,32 ---- argc = ac; gargv = av; + kpse_set_progname(av[0]); main_body (); return EXIT_SUCCESS; *** web2c/lib/openinout.c.save Sat Dec 4 13:01:52 1993 --- web2c/lib/openinout.c Wed Sep 28 16:26:41 1994 *************** *** 125,128 **** --- 125,131 ---- kpse_file_format_type format; { + static boolean kpathsea_dpi_set = 0; + static boolean maketex_base_dpi_set = 0; + string found; /* Since & is a no-op when applied to an array, we must put the *************** *** 130,133 **** --- 133,149 ---- string name = nameoffile; + if (!kpathsea_dpi_set) + { + if (!getenv ("KPATHSEA_DPI")) + xputenv_int ("KPATHSEA_DPI", 300); + kpathsea_dpi_set = 1; + } + if (!maketex_base_dpi_set) + { + if (!getenv ("MAKETEX_BASE_DPI")) + xputenv_int ("MAKETEX_BASE_DPI", 300); + maketex_base_dpi_set = 1; + } + make_c_string (&name); found = kpse_make_tex (format, name); *** web2c/lib/ourpaths.c.save Sun Dec 5 12:48:44 1993 --- web2c/lib/ourpaths.c Wed Sep 28 14:14:18 1994 *************** *** 3,14 **** #include "config.h" ! #include <kpathsea/filefmt.h> #include <kpathsea/fontmap.h> #include <kpathsea/pathsearch.h> ! /* `path_dirs' is initialized in `setpaths', to a null-terminated array of directories to search for. */ ! static string path_dirs[LAST_PATH]; --- 3,17 ---- #include "config.h" ! #include <kpathsea/cnf.h> ! #include <kpathsea/default.h> ! #include <kpathsea/expand.h> #include <kpathsea/fontmap.h> + #include <kpathsea/paths.h> #include <kpathsea/pathsearch.h> ! #include <kpathsea/tex-file.h> /* `path_dirs' is initialized in `setpaths', to a null-terminated array of directories to search for. */ ! static const_string path_dirs[LAST_PATH]; *************** *** 23,60 **** { if (path_bits & BIBINPUTPATHBIT) ! path_dirs[BIBINPUTPATH] = KPSE_BIB_PATH (); if (path_bits & BSTINPUTPATHBIT) ! path_dirs[BSTINPUTPATH] = KPSE_BST_PATH (); if (path_bits & GFFILEPATHBIT) ! path_dirs[GFFILEPATH] = KPSE_GF_PATH (); if (path_bits & MFBASEPATHBIT) ! path_dirs[MFBASEPATH] = KPSE_BASE_PATH (); if (path_bits & MFINPUTPATHBIT) ! path_dirs[MFINPUTPATH] = KPSE_MF_PATH (); if (path_bits & MFPOOLPATHBIT) ! path_dirs[MFPOOLPATH] = KPSE_MFPOOL_PATH (); if (path_bits & PKFILEPATHBIT) ! path_dirs[PKFILEPATH] = KPSE_PK_PATH (); if (path_bits & TEXFORMATPATHBIT) ! path_dirs[TEXFORMATPATH] = KPSE_FMT_PATH (); if (path_bits & TEXINPUTPATHBIT) ! path_dirs[TEXINPUTPATH] = KPSE_TEX_PATH (); if (path_bits & TEXPOOLPATHBIT) ! path_dirs[TEXPOOLPATH] = KPSE_TEXPOOL_PATH (); if (path_bits & TFMFILEPATHBIT) ! path_dirs[TFMFILEPATH] = KPSE_TFM_PATH (); if (path_bits & VFFILEPATHBIT) ! path_dirs[VFFILEPATH] = KPSE_VF_PATH (); } --- 26,83 ---- { if (path_bits & BIBINPUTPATHBIT) ! path_dirs[BIBINPUTPATH] = kpse_init_format (kpse_bib_format); if (path_bits & BSTINPUTPATHBIT) ! path_dirs[BSTINPUTPATH] = kpse_init_format (kpse_bst_format); if (path_bits & GFFILEPATHBIT) ! path_dirs[GFFILEPATH] = kpse_init_format (kpse_gf_format); if (path_bits & MFBASEPATHBIT) ! { ! string path = DEFAULT_MFBASES; ! path = kpse_expand_default (kpse_cnf_get (KPSE_BASE_ENVS), path); ! path = kpse_expand_default (getenv (KPSE_BASE_ENVS), path); ! path_dirs[MFBASEPATH] = kpse_path_expand (path); ! } if (path_bits & MFINPUTPATHBIT) ! path_dirs[MFINPUTPATH] = kpse_init_format (kpse_mf_format); if (path_bits & MFPOOLPATHBIT) ! { ! string path = DEFAULT_MFPOOL; ! path = kpse_expand_default (kpse_cnf_get (KPSE_MFPOOL_ENVS), path); ! path = kpse_expand_default (getenv (KPSE_MFPOOL_ENVS), path); ! path_dirs[MFPOOLPATH] = kpse_path_expand (path); ! } if (path_bits & PKFILEPATHBIT) ! path_dirs[PKFILEPATH] = kpse_init_format (kpse_pk_format); if (path_bits & TEXFORMATPATHBIT) ! { ! string path = DEFAULT_TEXFORMATS; ! path = kpse_expand_default (kpse_cnf_get (KPSE_FMT_ENVS), path); ! path = kpse_expand_default (getenv (KPSE_FMT_ENVS), path); ! path_dirs[TEXFORMATPATH] = kpse_path_expand (path); ! } if (path_bits & TEXINPUTPATHBIT) ! path_dirs[TEXINPUTPATH] = kpse_init_format (kpse_tex_format); if (path_bits & TEXPOOLPATHBIT) ! { ! string path = DEFAULT_TEXPOOL; ! path = kpse_expand_default (kpse_cnf_get (KPSE_TEXPOOL_ENVS), path); ! path = kpse_expand_default (getenv (KPSE_TEXPOOL_ENVS), path); ! path_dirs[TEXPOOLPATH] = kpse_path_expand (path); ! } if (path_bits & TFMFILEPATHBIT) ! path_dirs[TFMFILEPATH] = kpse_init_format (kpse_tfm_format); if (path_bits & VFFILEPATHBIT) ! path_dirs[VFFILEPATH] = kpse_init_format (kpse_vf_format); } *************** *** 72,76 **** { string found; ! string path = path_dirs[path_index]; make_c_string (&name); --- 95,99 ---- { string found; ! const_string path = path_dirs[path_index]; make_c_string (&name); *************** *** 79,83 **** have the dpi available separately, and anyway we don't care about having pktogf run MakeTeXPK, etc. */ ! found = kpse_path_search (path, name); /* If we didn't find it, and we're looking for a font, maybe it's --- 102,106 ---- have the dpi available separately, and anyway we don't care about having pktogf run MakeTeXPK, etc. */ ! found = kpse_path_search (path, name, true); /* If we didn't find it, and we're looking for a font, maybe it's *************** *** 89,96 **** { string *mapped_names; ! static map_type fontmap = NULL; /* Fault in the mapping if necessary. */ ! if (!fontmap) fontmap = map_create (path); --- 112,119 ---- { string *mapped_names; ! static hash_table_type fontmap = { NULL, 0 }; /* Fault in the mapping if necessary. */ ! if (fontmap.size == 0) fontmap = map_create (path); *************** *** 102,106 **** while ((mapped_name = *mapped_names++) && !found) { ! found = kpse_path_search (path, mapped_name); } } --- 125,129 ---- while ((mapped_name = *mapped_names++) && !found) { ! found = kpse_path_search (path, mapped_name, true); } } *** web2c/lib/texmf.c.save Sun Dec 5 12:53:01 1993 --- web2c/lib/texmf.c Fri Sep 23 22:33:56 1994 *************** *** 33,37 **** #include <kpathsea/c-ctype.h> #include <kpathsea/c-pathch.h> ! #include <kpathsea/tex-make.h> /* For `struct tm'. */ --- 33,37 ---- #include <kpathsea/c-ctype.h> #include <kpathsea/c-pathch.h> ! #include <kpathsea/tex-file.h> /* For `struct tm'. */ *************** *** 74,77 **** --- 74,79 ---- dump_default_length = strlen (dump_default + 1); + kpse_set_progname(av[0]); + #ifndef INI if (readyalready != 314159) *************** *** 99,103 **** || getenv ("USE_MAKETEXMF") || getenv ("MAKETEXMF"); ! KPSE_MAKE_SPEC_ENABLED (kpse_make_specs[kpse_mf_format]) = use_maketexmf; } #endif /* MF */ --- 101,105 ---- || getenv ("USE_MAKETEXMF") || getenv ("MAKETEXMF"); ! kpse_format_info[kpse_mf_format].program_enabled_p = use_maketexmf; } #endif /* MF */ *************** *** 110,115 **** || getenv ("USE_MAKETEXTFM") || getenv ("MAKETEXTFM"); ! KPSE_MAKE_SPEC_ENABLED (kpse_make_specs[kpse_tex_format]) = use_maketextex; ! KPSE_MAKE_SPEC_ENABLED (kpse_make_specs[kpse_tfm_format]) = use_maketextfm; } #endif /* TeX */ --- 112,117 ---- || getenv ("USE_MAKETEXTFM") || getenv ("MAKETEXTFM"); ! kpse_format_info[kpse_tex_format].program_enabled_p = use_maketextex; ! kpse_format_info[kpse_tfm_format].program_enabled_p = use_maketextfm; } #endif /* TeX */ *** web2c/mf/Makefile.in.save Thu Feb 3 04:48:35 1994 --- web2c/mf/Makefile.in Sat Sep 24 02:08:29 1994 *************** *** 46,52 **** libs = $(commono) $(LIBS) ! x_include_flags = @x_include_flags@ ! x_lib_flags = @x_lib_flags@ ! x_extra_libs = @x_extra_libs@ wlibs = @wlibs@ LIBS = @LIBS@ --- 46,52 ---- libs = $(commono) $(LIBS) ! x_include_flags = @X_CFLAGS@ ! x_lib_flags = @X_LIBS@ ! x_extra_libs = @X_EXTRA_LIBS@ wlibs = @wlibs@ LIBS = @LIBS@ *************** *** 72,77 **** # What to pass to submakes. makeargs=SHELL='$(SHELL)' CC='$(CC)' CFLAGS='$(CFLAGS)' \ ! LDFLAGS='$(LDFLAGS)' LIBS='$(libs)' RANLIB='$(RANLIB)' LN='$(LN)' \ ! srcdir=$(srcdir) --- 72,76 ---- # What to pass to submakes. makeargs=SHELL='$(SHELL)' CC='$(CC)' CFLAGS='$(CFLAGS)' \ ! LDFLAGS='$(LDFLAGS)' LIBS='$(libs)' RANLIB='$(RANLIB)' LN='$(LN)' -- End of web2c.kpathsea-2.2.help